2.1.7.6 - Bug fixes.

Author: igloo-gkendall

FormMain.cs

@@ -526,13 +526,13 @@ private void FormViewer_FormClosing(object sender, FormClosingEventArgs e)
 
                 formRegion.RegionCollection.Save();
 
-                SaveSettings();
-
                 // Exit.
                 Environment.Exit(0);
             }
             else
             {
+                SaveSettings();
+
                 RunTriggersOfConditionType(TriggerConditionType.InterfaceClosing);
 
                 // If there isn't a Trigger for "InterfaceClosing" that performs an action
@@ -876,7 +876,7 @@ private void ShowInterface()
             {
                 checkBoxPassphraseLock.Checked = false;
                 Settings.User.GetByKey("LockScreenCaptureSession").Value = false;
-                Settings.User.Save();
+                SaveSettings();
 
                 Opacity = 100;
                 toolStripMenuItemShowInterface.Enabled = false;
@@ -893,6 +893,8 @@ private void ShowInterface()
                     WindowState = FormWindowState.Normal;
                 }
 
+                RunTriggersOfConditionType(TriggerConditionType.InterfaceShowing);
+
                 Focus();
             }
         }
@@ -902,6 +904,8 @@ private void ShowInterface()
         /// </summary>
         private void HideInterface()
         {
+            SaveSettings();
+
             Log.Write("Hiding interface.");
 
             // Pause the slideshow if you find it still playing.
@@ -917,6 +921,8 @@ private void HideInterface()
             Hide();
             Visible = false;
             ShowInTaskbar = false;
+
+            RunTriggersOfConditionType(TriggerConditionType.InterfaceHiding);
         }
 
         /// <summary>
@@ -940,7 +946,7 @@ private void StopScreenCapture()
                 {
                     checkBoxPassphraseLock.Checked = false;
                     Settings.User.GetByKey("LockScreenCaptureSession").Value = false;
-                    Settings.User.Save();
+                    SaveSettings();
 
                     ScreenCapture.Count = 0;
                     timerScreenCapture.Enabled = false;
@@ -1422,7 +1428,7 @@ private void ExitApplication()
 
                 checkBoxPassphraseLock.Checked = false;
                 Settings.User.GetByKey("LockScreenCaptureSession").Value = false;
-                Settings.User.Save();
+                SaveSettings();
 
                 // Hide the system tray icon.
                 notifyIcon.Visible = false;
@@ -1452,8 +1458,6 @@ private void ExitApplication()
 
                 formRegion.RegionCollection.Save();
 
-                SaveSettings();
-
                 // Exit.
                 Environment.Exit(0);
             }
@@ -2706,7 +2710,7 @@ private void Click_buttonSetPassphrase(object sender, EventArgs e)
             if (textBoxPassphrase.Text.Length > 0)
             {
                 Settings.User.GetByKey("Passphrase").Value = textBoxPassphrase.Text;
-                Settings.User.Save();
+                SaveSettings();
 
                 textBoxPassphrase.ReadOnly = true;
                 buttonSetPassphrase.Enabled = false;
@@ -2730,7 +2734,7 @@ private void Click_buttonClearPassphrase(object sender, EventArgs e)
 
             Settings.User.GetByKey("LockScreenCaptureSession").Value = false;
             Settings.User.GetByKey("Passphrase").Value = string.Empty;
-            Settings.User.Save();
+            SaveSettings();
 
             textBoxPassphrase.Focus();
         }

Log.cs

@@ -57,6 +57,16 @@ public static void Write(string message, Exception ex)
                             sw.Flush();
                             sw.Close();
                         }
+
+                        using (StreamWriter sw = new StreamWriter(FileSystem.LogsFolder + logFile + extension, true))
+                        {
+                            sw.WriteLine("[(v" + Settings.Application.GetByKey("Version").Value + ") " +
+                                         DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss") + "] " + message + " - Error: " +
+                                         ex.Message);
+
+                            sw.Flush();
+                            sw.Close();
+                        }
                     }
                     else
                     {

modules/screen/ScreenshotCollection.cs

@@ -34,46 +34,53 @@ public static class ScreenshotCollection
 
         public static void Add(Screenshot newScreenshot, ScreenshotType screenshotType)
         {
-            // Make sure we only intend to add the new screenshot to the user's XML formatted settings.
-            if (screenshotType == ScreenshotType.User)
+            try
             {
-                XmlNode xScreenshots = xDoc.GetElementsByTagName(XML_FILE_SCREENSHOTS_NODE).Item(0);
+                // Make sure we only intend to add the new screenshot to the user's XML formatted settings.
+                if (screenshotType == ScreenshotType.User)
+                {
+                    XmlNode xScreenshots = xDoc.GetElementsByTagName(XML_FILE_SCREENSHOTS_NODE).Item(0);
 
-                XmlElement xNewScreenshot = xDoc.CreateElement(XML_FILE_SCREENSHOT_NODE);
+                    XmlElement xNewScreenshot = xDoc.CreateElement(XML_FILE_SCREENSHOT_NODE);
 
-                XmlElement xNewScreenshotIndex = xDoc.CreateElement(SCREENSHOT_INDEX);
-                xNewScreenshotIndex.InnerText = newScreenshot.Index.ToString();
+                    XmlElement xNewScreenshotIndex = xDoc.CreateElement(SCREENSHOT_INDEX);
+                    xNewScreenshotIndex.InnerText = newScreenshot.Index.ToString();
 
-                XmlElement xNewScreenshotDate = xDoc.CreateElement(SCREENSHOT_DATE);
-                xNewScreenshotDate.InnerText = newScreenshot.Date;
+                    XmlElement xNewScreenshotDate = xDoc.CreateElement(SCREENSHOT_DATE);
+                    xNewScreenshotDate.InnerText = newScreenshot.Date;
 
-                XmlElement xNewScreenshotPath = xDoc.CreateElement(SCREENSHOT_PATH);
-                xNewScreenshotPath.InnerText = newScreenshot.Path;
+                    XmlElement xNewScreenshotPath = xDoc.CreateElement(SCREENSHOT_PATH);
+                    xNewScreenshotPath.InnerText = newScreenshot.Path;
 
-                XmlElement xNewScreenshotScreen = xDoc.CreateElement(SCREENSHOT_SCREEN);
-                xNewScreenshotScreen.InnerText = newScreenshot.Screen.ToString();
+                    XmlElement xNewScreenshotScreen = xDoc.CreateElement(SCREENSHOT_SCREEN);
+                    xNewScreenshotScreen.InnerText = newScreenshot.Screen.ToString();
 
-                XmlElement xNewScreenshotFormat = xDoc.CreateElement(SCREENSHOT_FORMAT);
-                xNewScreenshotFormat.InnerText = newScreenshot.Format;
+                    XmlElement xNewScreenshotFormat = xDoc.CreateElement(SCREENSHOT_FORMAT);
+                    xNewScreenshotFormat.InnerText = newScreenshot.Format;
 
-                XmlElement xNewScreenshotFilename = xDoc.CreateElement(SCREENSHOT_FILENAME);
-                xNewScreenshotFilename.InnerText = newScreenshot.Filename;
+                    XmlElement xNewScreenshotFilename = xDoc.CreateElement(SCREENSHOT_FILENAME);
+                    xNewScreenshotFilename.InnerText = newScreenshot.Filename;
 
-                XmlElement xNewScreenshotSlidename = xDoc.CreateElement(SCREENSHOT_SLIDENAME);
-                xNewScreenshotSlidename.InnerText = newScreenshot.Slidename;
+                    XmlElement xNewScreenshotSlidename = xDoc.CreateElement(SCREENSHOT_SLIDENAME);
+                    xNewScreenshotSlidename.InnerText = newScreenshot.Slidename;
 
-                // Append all the nodes in the appropriate locations.
-                xNewScreenshot.AppendChild(xNewScreenshotIndex);
-                xNewScreenshot.AppendChild(xNewScreenshotDate);
-                xNewScreenshot.AppendChild(xNewScreenshotPath);
-                xNewScreenshot.AppendChild(xNewScreenshotScreen);
-                xNewScreenshot.AppendChild(xNewScreenshotFormat);
-                xNewScreenshot.AppendChild(xNewScreenshotFilename);
-                xNewScreenshot.AppendChild(xNewScreenshotSlidename);
-                xScreenshots.AppendChild(xNewScreenshot);
+                    // Append all the nodes in the appropriate locations.
+                    xNewScreenshot.AppendChild(xNewScreenshotIndex);
+                    xNewScreenshot.AppendChild(xNewScreenshotDate);
+                    xNewScreenshot.AppendChild(xNewScreenshotPath);
+                    xNewScreenshot.AppendChild(xNewScreenshotScreen);
+                    xNewScreenshot.AppendChild(xNewScreenshotFormat);
+                    xNewScreenshot.AppendChild(xNewScreenshotFilename);
+                    xNewScreenshot.AppendChild(xNewScreenshotSlidename);
+                    xScreenshots.AppendChild(xNewScreenshot);
 
-                // Add the new screenshot to the collection of screenshots.
-                _screenshotList.Add(newScreenshot);
+                    // Add the new screenshot to the collection of screenshots.
+                    _screenshotList.Add(newScreenshot);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Write("ScreenshotCollection::Add", ex);
             }
         }