Fixed error when scanning after clearing previously scanned images.

Fixed console help text.
cyanfish · Sep 25, 2013 · 861eefe · 861eefe
1 parent e9cc86b
commit 861eefe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/NAPS2.Console/AutomatedScanningOptions.cs b/NAPS2.Console/AutomatedScanningOptions.cs
@@ -28,8 +28,8 @@ namespace NAPS2.Console
     public class AutomatedScanningOptions : CommandLineOptions
     {
         [Option('o', "output", HelpText = "The name and path of the file to save." +
-                                          " The extension determines the output type (e.g. .pdf for a PDF file, .jpg for a JPEG)." +
-                                          " You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan.")]
+                                          " The extension determines the output type (e.g. .pdf for a PDF file, .jpg for a JPEG).")]
+        //" You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan.")]
         public string OutputPath { get; set; }
 
         [Option('p', "profile", HelpText = "The name of the profile to use for scanning." +
@@ -54,17 +54,17 @@ public class AutomatedScanningOptions : CommandLineOptions
         public bool WaitForEnter { get; set; }
 
         [Option('e', "email", HelpText = "The name of the file to attach to an email." +
-                                         " The extension determines the output type (e.g. .pdf for a PDF file, .jpg for a JPEG)." +
-                                         " You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan.")]
+                                         " The extension determines the output type (e.g. .pdf for a PDF file, .jpg for a JPEG).")]
+        //" You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan.")]
         public string EmailFileName { get; set; }
 
         [Option("subject", HelpText = "The email message's subject." +
-                                      " You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan." +
+            //" You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan." +
                                       " Requires -e/--email.")]
         public string EmailSubject { get; set; }
 
         [Option("body", HelpText = "The email message's body text." +
-                                   " You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan." +
+            //" You can use \"<date>\" and/or \"<time>\" to insert the date/time of the scan." +
                                    " Requires -e/--email.")]
         public string EmailBody { get; set; }
 

diff --git a/NAPS2/Scan/Images/FileBasedScannedImage.cs b/NAPS2/Scan/Images/FileBasedScannedImage.cs
@@ -143,6 +143,7 @@ public void Dispose()
                     {
                         _recoveryLock.Dispose();
                         RecoveryFolder.Delete(true);
+                        _recoveryFolder = null;
                     }
                 }
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -143,6 +143,7 @@ public void Dispose() @@
                         {
                             _recoveryLock.Dispose();
                             RecoveryFolder.Delete(true);
+                            _recoveryFolder = null;
                         }
                     }
                 }
@@ Expand Down @@