2.3.4.7 - Fixed File Transfer when OptimizeScreenCapture disabled and fixed SaveScreenshotRefs when dealing with mutex. This is a post-release hotfix so the exe is on SourceForge but not GitHub.

Author: gavinkendall

interface/main/FormMain-Screenshots.cs

@@ -682,11 +682,11 @@ private void EmailScreenshot(TriggerActionType triggerActionType)
             {
                 Screenshot lastScreenshotOfThisView = _screenshotCollection.GetLastScreenshotOfView(_screenshotCollection.LastViewId);
 
-                if (lastScreenshotOfThisView != null && lastScreenshotOfThisView.Slide != null && !string.IsNullOrEmpty(lastScreenshotOfThisView.Path) && !string.IsNullOrEmpty(lastScreenshotOfThisView.Hash))
+                if (lastScreenshotOfThisView != null && lastScreenshotOfThisView.Slide != null && !string.IsNullOrEmpty(lastScreenshotOfThisView.Path))
                 {
                     if (_screenshotCollection.OptimizeScreenCapture)
                     {
-                        if (!_screenshotCollection.EmailedScreenshotHashList.Contains(lastScreenshotOfThisView.Hash))
+                        if (!string.IsNullOrEmpty(lastScreenshotOfThisView.Hash) && !_screenshotCollection.EmailedScreenshotHashList.Contains(lastScreenshotOfThisView.Hash))
                         {
                             if (EmailScreenshot(lastScreenshotOfThisView, prompt: false))
                             {
@@ -814,7 +814,7 @@ private void FileTransferScreenshot(TriggerActionType triggerActionType)
             {
                 Screenshot lastScreenshotOfThisView = _screenshotCollection.GetLastScreenshotOfView(_screenshotCollection.LastViewId);
 
-                if (lastScreenshotOfThisView != null && lastScreenshotOfThisView.Slide != null && !string.IsNullOrEmpty(lastScreenshotOfThisView.Path) && !string.IsNullOrEmpty(lastScreenshotOfThisView.Hash))
+                if (lastScreenshotOfThisView != null && lastScreenshotOfThisView.Slide != null && !string.IsNullOrEmpty(lastScreenshotOfThisView.Path))
                 {
                     FileTransferScreenshot(lastScreenshotOfThisView);
                 }

modules/screenshots/ScreenshotCollection.cs

@@ -883,15 +883,10 @@ public void SaveToXmlFile(Config config)
         {
             try
             {
-                bool saveScreenshotRefs = Convert.ToBoolean(config.Settings.User.GetByKey("SaveScreenshotRefs", config.Settings.DefaultSettings.SaveScreenshotRefs).Value);
-
-                if (!saveScreenshotRefs)
-                {
-                    return;
-                }
-
                 _mutexWriteFile.WaitOne();
 
+                bool saveScreenshotRefs = Convert.ToBoolean(config.Settings.User.GetByKey("SaveScreenshotRefs", config.Settings.DefaultSettings.SaveScreenshotRefs).Value);
+
                 if (string.IsNullOrEmpty(_fileSystem.ScreenshotsFile))
                 {
                     _fileSystem.ScreenshotsFile = _fileSystem.DefaultScreenshotsFile;
@@ -916,7 +911,10 @@ public void SaveToXmlFile(Config config)
 
                         xDoc.AppendChild(rootElement);
 
-                        xDoc.Save(_fileSystem.ScreenshotsFile);
+                        if (saveScreenshotRefs)
+                        {
+                            xDoc.Save(_fileSystem.ScreenshotsFile);
+                        }
                     }
 
                     if (_fileSystem.FileExists(_fileSystem.ConfigFile))
@@ -1019,7 +1017,10 @@ public void SaveToXmlFile(Config config)
                     {
                         lock (xDoc)
                         {
-                            xDoc.Save(_fileSystem.ScreenshotsFile);
+                            if (saveScreenshotRefs)
+                            {
+                                xDoc.Save(_fileSystem.ScreenshotsFile);
+                            }
                         }
                     }
                 }