thumbnails related logic in cs generator amended

git-svn-id: file:///svnroot/renrot/trunk@539 fe2816f4-e837-0410-b10a-f608c9d244a1

1 files changed, 7 insertions, 3 deletions

diff --git a/renrot b/renrot
index c408355..42b6bd9 100755
--- a/renrot
+++ b/renrot
@@ -1273,14 +1273,18 @@ sub contactSheetGenerator {
       } else {
         $filefull = $ThumbnailOriginal;
       }
-    } elsif ($contactSheetThm == 0 and not defined ${$$info{ThumbnailImage}}) {
-      procmsg ("WARNING: $filefull has no ThumbnailImage tag. Stub thumbnail image'll be used.\n");
+    } elsif ($contactSheetThm == 0 and not defined ${$$info{ThumbnailImage}} and $gen_thm == 0) {
+      warnmsg ("$filefull has no ThumbnailImage tag. Stub thumbnail image'll be used.\n");
       if (not -f $workdir . "thmbstub.jpg") {
         thm_gen_stub ($workdir, "thmbstub.jpg");
-        procmsg ("Stub thumbnail image've been created.\n");
       }
       copy ($workdir . "thmbstub.jpg", $workdir . $file);
       $filefull = $workdir . $file;
+    } elsif ($contactSheetThm == 0 and not defined ${$$info{ThumbnailImage}} and $gen_thm != 0) {
+      warnmsg ("$filefull has no ThumbnailImage tag. Thumbnail image'll be generated.\n");
+
+      move (thm_gen_orig ($file, 0), $workdir . $file);
+      $filefull = $workdir . $file;
     }
 
     $infothm = $exifToolObj->ImageInfo($filefull);