1 files changed, 32 insertions, 18 deletions

diff --git a/renrot b/renrot
index b663a68..9bada72 100755
--- a/renrot
+++ b/renrot
@@ -666,25 +666,10 @@ sub renRotProcess {
 
 		# analyzing whether and how to rename file
 		$newFileName = renameFile($exifToolObj, $info, $file, $fileCounter, $counterSize, $angleSuffix);
-		
+
 		# to save RenRotFileNameOriginal tag we have to rewrite it each time we anyhow prosess file
-		my $fileNameOriginal = $exifToolObj->GetValue("RenRotFileNameOriginal");
-		if (not defined $fileNameOriginal) {
-			$tags{'RenRotFileNameOriginal'} = {value => $file, group => 'RenRot'};
-			dbgmsg (2, "renameFile(): set RenRotFileNameOriginal to $file.\n");
-		} else {
+		saveOurHdrs($exifToolObj, $info, $file);
 
-			$tags{'RenRotFileNameOriginal'} = {
-						value => $info->{"RenRotFileNameOriginal"},
-						group => 'RenRot' 
-					};
-			dbgmsg (2, "renameFile(): RenRotFileNameOriginal: $fileNameOriginal.\n");
-		}
-		$exifToolObj->SetNewValue(
-					"RenRotFileNameOriginal",
-					$tags{'RenRotFileNameOriginal'}{value},
-					Group => $tags{'RenRotFileNameOriginal'}{group}
-				);
 		# Writing tags.
 		tagWriter($exifToolObj, $newFileName) if ($noTags == 0);
 
@@ -699,6 +684,35 @@ sub renRotProcess {
 
 ########################################################################################
 #
+# saveOurHdrs() saves our defined tags to file
+#
+sub saveOurHdrs {
+	my $exifToolObj = shift;
+	my $infoObj = shift;
+	my $file = shift;
+
+	my $fileNameOriginal = $exifToolObj->GetValue("RenRotFileNameOriginal");
+
+	if (not defined $fileNameOriginal) {
+		$tags{'RenRotFileNameOriginal'} = {value => $file, group => 'RenRot'};
+		dbgmsg (2, "saveOurHdrs(): set RenRotFileNameOriginal to $file.\n");
+	} else {
+		$tags{'RenRotFileNameOriginal'} = {
+				value => $infoObj->{"RenRotFileNameOriginal"},
+				group => 'RenRot'
+		};
+		dbgmsg (2, "saveOurHdrs(): RenRotFileNameOriginal: $fileNameOriginal.\n");
+	}
+
+	$exifToolObj->SetNewValue(
+			"RenRotFileNameOriginal",
+			$tags{'RenRotFileNameOriginal'}{value},
+			Group => $tags{'RenRotFileNameOriginal'}{group}
+	);
+}
+
+########################################################################################
+#
 # rotateFile() rotates file and its thumbnail if needed, changes Orientation tag
 #
 sub rotateFile {
@@ -1127,7 +1141,7 @@ sub rotateImg {
 		rename ($oldfile, $origfile) || ( fatalmsg ("$oldfile -> $origfile\n"), die );
 	}
 	rename ($newfile, $oldfile)  || ( fatalmsg ("$newfile -> $oldfile\n"), die );
-	
+
 	# writing the changes to the EXIFs
 	exifWriter($exifAfterRot, $oldfile);
 }