From d1bdacd0371ae7bda4af12bfb6737c28c0254efd Mon Sep 17 00:00:00 2001
From: Gavin Kendall <gkendall@igloosoftware.com>
Date: Mon, 7 Dec 2020 09:21:58 -0500
Subject: [PATCH] 2.3.3.5 - Application Focus now has Delay Before and Delay
 After options.

---
 Properties/AssemblyInfo.cs               |  4 +-
 app.manifest                             |  2 +-
 command/CommandLineRegex.cs              | 10 +++
 interface/FormAbout.resx                 |  5 +-
 interface/main/FormMain-CommandLine.cs   | 32 ++++++++++
 interface/main/FormMain-ScreenCapture.cs |  2 +-
 interface/main/FormMain-Settings.cs      |  7 +-
 interface/main/FormMain.Designer.cs      | 81 +++++++++++++++++++++---
 interface/main/FormMain.cs               | 20 +++++-
 settings/DefaultSettings.cs              |  2 +
 settings/Settings.cs                     |  1 +
 11 files changed, 148 insertions(+), 18 deletions(-)

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 8bc407a6..dbdf68b8 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.3.4")]
-[assembly: AssemblyFileVersion("2.3.3.4")]
+[assembly: AssemblyVersion("2.3.3.5")]
+[assembly: AssemblyFileVersion("2.3.3.5")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]
\ No newline at end of file
diff --git a/app.manifest b/app.manifest
index 211f4b66..2d934144 100644
--- a/app.manifest
+++ b/app.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.3.3.4"/>
+    version="2.3.3.5"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>
diff --git a/command/CommandLineRegex.cs b/command/CommandLineRegex.cs
index 065d04f9..25a769ea 100644
--- a/command/CommandLineRegex.cs
+++ b/command/CommandLineRegex.cs
@@ -150,5 +150,15 @@ public static class CommandLineRegex
         /// Regex for parsing the -label command.
         /// </summary>
         public const string REGEX_COMMAND_LINE_LABEL = "^-label=(?<Label>.+)$";
+
+        /// <summary>
+        /// Regex for parsing the -applicationFocusDelayBefore command.
+        /// </summary>
+        public const string REGEX_COMMAND_LINE_APPLICATION_FOCUS_DELAY_BEFORE = @"^-applicationFocusDelayBefore=(?<ApplicationFocusDelayBefore>\d{1,5})$";
+
+        /// <summary>
+        /// Regex for parsing the -applicationFocusDelayAfter command.
+        /// </summary>
+        public const string REGEX_COMMAND_LINE_APPLICATION_FOCUS_DELAY_AFTER = @"^-applicationFocusDelayAfter=(?<ApplicationFocusDelayAfter>\d{1,5})$";
     }
 }
diff --git a/interface/FormAbout.resx b/interface/FormAbout.resx
index 596e6861..53fb53bb 100644
--- a/interface/FormAbout.resx
+++ b/interface/FormAbout.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="richTextBoxDeveloper.Text" xml:space="preserve">
-    <value>Auto Screen Capture 2.3.3.4 ("Boombayah")
+    <value>Auto Screen Capture 2.3.3.5 ("Boombayah")
 Developed by Gavin Kendall (2008 - 2020)
 
 SourceForge Project Site
@@ -322,7 +322,8 @@ END OF TERMS AND CONDITIONS</value>
   </data>
   <data name="richTextBoxChangelog.Text" xml:space="preserve">
     <value>Codename "Boombayah"
-2.3.3.4    Bug fix to saving of file when adding screenshot to collection.
+2.3.3.5    Application Focus now has Delay Before and Delay After options.
+2.3.3.4    A bug fix for saving of file when adding screenshot to collection.
 2.3.3.3    An internal list of image hash values are stored when emailing screenshots so we do not email duplicate images.
 2.3.3.2    Can now run an Editor without arguments or without %filepath% tag when using Run Editor trigger action. Includes changes to version collection, change to how Application Focus behaves when application not found (so now adds the application to the process list regardless), and bug fix applied to threads.
 2.3.3.1    New command line arguments -activeWindowTitle, -applicationFocus, and -label.
diff --git a/interface/main/FormMain-CommandLine.cs b/interface/main/FormMain-CommandLine.cs
index b44dd681..f6b3f344 100644
--- a/interface/main/FormMain-CommandLine.cs
+++ b/interface/main/FormMain-CommandLine.cs
@@ -439,6 +439,8 @@ private void ParseCommandLineArguments(string[] args)
                             }
 
                             RefreshApplicationFocusList();
+
+                            DoApplicationFocus();
                         }
                     }
 
@@ -468,6 +470,36 @@ private void ParseCommandLineArguments(string[] args)
                             comboBoxScreenshotLabel.Text = label;
                         }
                     }
+
+                    // -applicationFocusDelayBefore=x
+                    if (Regex.IsMatch(arg, CommandLineRegex.REGEX_COMMAND_LINE_APPLICATION_FOCUS_DELAY_BEFORE))
+                    {
+                        int delayBefore = Convert.ToInt32(Regex.Match(arg, CommandLineRegex.REGEX_COMMAND_LINE_APPLICATION_FOCUS_DELAY_BEFORE).Groups["ApplicationFocusDelayBefore"].Value);
+
+                        Settings.User.SetValueByKey("ApplicationFocusDelayBefore", delayBefore);
+
+                        if (!Settings.User.Save())
+                        {
+                            _screenCapture.ApplicationError = true;
+                        }
+
+                        numericUpDownApplicationFocusDelayBefore.Value = delayBefore;
+                    }
+
+                    // -applicationFocusDelayAfter=x
+                    if (Regex.IsMatch(arg, CommandLineRegex.REGEX_COMMAND_LINE_APPLICATION_FOCUS_DELAY_AFTER))
+                    {
+                        int delayAfter = Convert.ToInt32(Regex.Match(arg, CommandLineRegex.REGEX_COMMAND_LINE_APPLICATION_FOCUS_DELAY_AFTER).Groups["ApplicationFocusDelayAfter"].Value);
+
+                        Settings.User.SetValueByKey("ApplicationFocusDelayAfter", delayAfter);
+
+                        if (!Settings.User.Save())
+                        {
+                            _screenCapture.ApplicationError = true;
+                        }
+
+                        numericUpDownApplicationFocusDelayAfter.Value = delayAfter;
+                    }
                 }
 
                 if (ScreenCapture.AutoStartFromCommandLine)
diff --git a/interface/main/FormMain-ScreenCapture.cs b/interface/main/FormMain-ScreenCapture.cs
index e599590b..8c870f2e 100644
--- a/interface/main/FormMain-ScreenCapture.cs
+++ b/interface/main/FormMain-ScreenCapture.cs
@@ -180,7 +180,7 @@ private void TakeScreenshot(bool captureNow)
                     _screenCapture.DateTimePreviousCycle = dtNow;
                 }
 
-                ScreenCapture.SetApplicationFocus(comboBoxProcessList.Text);
+                DoApplicationFocus();
 
                 _screenCapture.ActiveWindowTitle = _screenCapture.GetActiveWindowTitle();
 
diff --git a/interface/main/FormMain-Settings.cs b/interface/main/FormMain-Settings.cs
index 4babcf5a..87ccd53d 100644
--- a/interface/main/FormMain-Settings.cs
+++ b/interface/main/FormMain-Settings.cs
@@ -241,6 +241,8 @@ private void SaveSettings()
 
                 // Application Focus
                 Settings.User.GetByKey("ApplicationFocus", DefaultSettings.ApplicationFocus).Value = comboBoxProcessList.Text;
+                Settings.User.GetByKey("ApplicationFocusDelayBefore", DefaultSettings.ApplicationFocusDelayBefore).Value = (int)numericUpDownApplicationFocusDelayBefore.Value;
+                Settings.User.GetByKey("ApplicationFocusDelayAfter", DefaultSettings.ApplicationFocusDelayAfter).Value = (int)numericUpDownApplicationFocusDelayAfter.Value;
 
                 // Region Select / Auto Save.
                 Settings.User.GetByKey("AutoSaveFolder", DefaultSettings.AutoSaveFolder).Value = textBoxAutoSaveFolder.Text.Trim();
@@ -297,7 +299,10 @@ private void RefreshApplicationFocusList()
                 comboBoxProcessList.Items.Add(applicationFocus);
             }
 
-            comboBoxProcessList.SelectedIndex = comboBoxProcessList.Items.IndexOf(applicationFocus);            
+            comboBoxProcessList.SelectedIndex = comboBoxProcessList.Items.IndexOf(applicationFocus);
+
+            numericUpDownApplicationFocusDelayBefore.Value = Convert.ToInt32(Settings.User.GetByKey("ApplicationFocusDelayBefore", DefaultSettings.ApplicationFocusDelayBefore).Value);
+            numericUpDownApplicationFocusDelayAfter.Value = Convert.ToInt32(Settings.User.GetByKey("ApplicationFocusDelayAfter", DefaultSettings.ApplicationFocusDelayAfter).Value);
         }
     }
 }
diff --git a/interface/main/FormMain.Designer.cs b/interface/main/FormMain.Designer.cs
index 0ca96d41..e5e0569d 100644
--- a/interface/main/FormMain.Designer.cs
+++ b/interface/main/FormMain.Designer.cs
@@ -53,6 +53,7 @@ private void InitializeComponent()
             this.toolStripSeparatorTools = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripMenuItemStartScreenCapture = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItemStopScreenCapture = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparatorScreenCapture = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripMenuItemCaptureNowArchive = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItemCaptureNowEdit = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparatorCaptureNow = new System.Windows.Forms.ToolStripSeparator();
@@ -66,6 +67,8 @@ private void InitializeComponent()
             this.tabControlModules = new System.Windows.Forms.TabControl();
             this.tabPageSetup = new System.Windows.Forms.TabPage();
             this.groupBoxApplicationFocus = new System.Windows.Forms.GroupBox();
+            this.labelApplicationFocusDelayAfter = new System.Windows.Forms.Label();
+            this.labelApplicationFocusDelayBefore = new System.Windows.Forms.Label();
             this.buttonApplicationFocusTest = new System.Windows.Forms.Button();
             this.buttonApplicationFocusRefresh = new System.Windows.Forms.Button();
             this.comboBoxProcessList = new System.Windows.Forms.ComboBox();
@@ -130,7 +133,8 @@ private void InitializeComponent()
             this.labelLabel = new System.Windows.Forms.Label();
             this.labelHelp = new System.Windows.Forms.Label();
             this.timerShowNextHelpTip = new System.Windows.Forms.Timer(this.components);
-            this.toolStripSeparatorScreenCapture = new System.Windows.Forms.ToolStripSeparator();
+            this.numericUpDownApplicationFocusDelayBefore = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownApplicationFocusDelayAfter = new System.Windows.Forms.NumericUpDown();
             this.statusStrip.SuspendLayout();
             this.contextMenuStripSystemTrayIcon.SuspendLayout();
             this.tabControlModules.SuspendLayout();
@@ -147,6 +151,8 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownHoursInterval)).BeginInit();
             this.tabPageScreenshots.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeepScreenshotsForDays)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownApplicationFocusDelayBefore)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownApplicationFocusDelayAfter)).BeginInit();
             this.SuspendLayout();
             // 
             // monthCalendar
@@ -301,7 +307,7 @@ private void InitializeComponent()
             this.toolStripSeparatorApplyLabel,
             this.toolStripMenuItemExit});
             this.contextMenuStripSystemTrayIcon.Name = "contextMenuStrip";
-            this.contextMenuStripSystemTrayIcon.Size = new System.Drawing.Size(222, 354);
+            this.contextMenuStripSystemTrayIcon.Size = new System.Drawing.Size(222, 332);
             this.contextMenuStripSystemTrayIcon.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripSystemTrayIcon_Opening);
             // 
             // toolStripMenuItemAbout
@@ -365,6 +371,11 @@ private void InitializeComponent()
             this.toolStripMenuItemStopScreenCapture.Text = "Stop Screen Capture";
             this.toolStripMenuItemStopScreenCapture.Click += new System.EventHandler(this.toolStripMenuItemStopScreenCapture_Click);
             // 
+            // toolStripSeparatorScreenCapture
+            // 
+            this.toolStripSeparatorScreenCapture.Name = "toolStripSeparatorScreenCapture";
+            this.toolStripSeparatorScreenCapture.Size = new System.Drawing.Size(218, 6);
+            // 
             // toolStripMenuItemCaptureNowArchive
             // 
             this.toolStripMenuItemCaptureNowArchive.Image = global::AutoScreenCapture.Properties.Resources.capture_archive;
@@ -473,19 +484,41 @@ private void InitializeComponent()
             // 
             // groupBoxApplicationFocus
             // 
+            this.groupBoxApplicationFocus.Controls.Add(this.numericUpDownApplicationFocusDelayAfter);
+            this.groupBoxApplicationFocus.Controls.Add(this.numericUpDownApplicationFocusDelayBefore);
+            this.groupBoxApplicationFocus.Controls.Add(this.labelApplicationFocusDelayAfter);
+            this.groupBoxApplicationFocus.Controls.Add(this.labelApplicationFocusDelayBefore);
             this.groupBoxApplicationFocus.Controls.Add(this.buttonApplicationFocusTest);
             this.groupBoxApplicationFocus.Controls.Add(this.buttonApplicationFocusRefresh);
             this.groupBoxApplicationFocus.Controls.Add(this.comboBoxProcessList);
             this.groupBoxApplicationFocus.Location = new System.Drawing.Point(6, 256);
             this.groupBoxApplicationFocus.Name = "groupBoxApplicationFocus";
-            this.groupBoxApplicationFocus.Size = new System.Drawing.Size(205, 76);
+            this.groupBoxApplicationFocus.Size = new System.Drawing.Size(205, 128);
             this.groupBoxApplicationFocus.TabIndex = 0;
             this.groupBoxApplicationFocus.TabStop = false;
             this.groupBoxApplicationFocus.Text = "Application Focus";
             // 
+            // labelApplicationFocusDelayAfter
+            // 
+            this.labelApplicationFocusDelayAfter.AutoSize = true;
+            this.labelApplicationFocusDelayAfter.Location = new System.Drawing.Point(6, 75);
+            this.labelApplicationFocusDelayAfter.Name = "labelApplicationFocusDelayAfter";
+            this.labelApplicationFocusDelayAfter.Size = new System.Drawing.Size(127, 13);
+            this.labelApplicationFocusDelayAfter.TabIndex = 2;
+            this.labelApplicationFocusDelayAfter.Text = "Delay After (milliseconds):";
+            // 
+            // labelApplicationFocusDelayBefore
+            // 
+            this.labelApplicationFocusDelayBefore.AutoSize = true;
+            this.labelApplicationFocusDelayBefore.Location = new System.Drawing.Point(6, 49);
+            this.labelApplicationFocusDelayBefore.Name = "labelApplicationFocusDelayBefore";
+            this.labelApplicationFocusDelayBefore.Size = new System.Drawing.Size(136, 13);
+            this.labelApplicationFocusDelayBefore.TabIndex = 1;
+            this.labelApplicationFocusDelayBefore.Text = "Delay Before (milliseconds):";
+            // 
             // buttonApplicationFocusTest
             // 
-            this.buttonApplicationFocusTest.Location = new System.Drawing.Point(5, 46);
+            this.buttonApplicationFocusTest.Location = new System.Drawing.Point(6, 98);
             this.buttonApplicationFocusTest.Name = "buttonApplicationFocusTest";
             this.buttonApplicationFocusTest.Size = new System.Drawing.Size(92, 23);
             this.buttonApplicationFocusTest.TabIndex = 0;
@@ -496,7 +529,7 @@ private void InitializeComponent()
             // 
             // buttonApplicationFocusRefresh
             // 
-            this.buttonApplicationFocusRefresh.Location = new System.Drawing.Point(106, 46);
+            this.buttonApplicationFocusRefresh.Location = new System.Drawing.Point(107, 98);
             this.buttonApplicationFocusRefresh.Name = "buttonApplicationFocusRefresh";
             this.buttonApplicationFocusRefresh.Size = new System.Drawing.Size(92, 23);
             this.buttonApplicationFocusRefresh.TabIndex = 0;
@@ -522,7 +555,7 @@ private void InitializeComponent()
             this.groupBoxRegionSelectAutoSave.Controls.Add(this.labelAutoSaveFolder);
             this.groupBoxRegionSelectAutoSave.Controls.Add(this.textBoxAutoSaveMacro);
             this.groupBoxRegionSelectAutoSave.Controls.Add(this.textBoxAutoSaveFolder);
-            this.groupBoxRegionSelectAutoSave.Location = new System.Drawing.Point(6, 338);
+            this.groupBoxRegionSelectAutoSave.Location = new System.Drawing.Point(6, 390);
             this.groupBoxRegionSelectAutoSave.Name = "groupBoxRegionSelectAutoSave";
             this.groupBoxRegionSelectAutoSave.Size = new System.Drawing.Size(205, 78);
             this.groupBoxRegionSelectAutoSave.TabIndex = 0;
@@ -613,7 +646,7 @@ private void InitializeComponent()
             this.groupBoxSecurity.Controls.Add(this.labelPasswordDescription);
             this.groupBoxSecurity.Controls.Add(this.buttonSetPassphrase);
             this.groupBoxSecurity.Controls.Add(this.textBoxPassphrase);
-            this.groupBoxSecurity.Location = new System.Drawing.Point(6, 422);
+            this.groupBoxSecurity.Location = new System.Drawing.Point(6, 474);
             this.groupBoxSecurity.Name = "groupBoxSecurity";
             this.groupBoxSecurity.Size = new System.Drawing.Size(205, 110);
             this.groupBoxSecurity.TabIndex = 0;
@@ -1195,10 +1228,31 @@ private void InitializeComponent()
             this.timerShowNextHelpTip.Interval = 20000;
             this.timerShowNextHelpTip.Tick += new System.EventHandler(this.timerShowNextHelpTip_Tick);
             // 
-            // toolStripSeparatorScreenCapture
+            // numericUpDownApplicationFocusDelayBefore
             // 
-            this.toolStripSeparatorScreenCapture.Name = "toolStripSeparatorScreenCapture";
-            this.toolStripSeparatorScreenCapture.Size = new System.Drawing.Size(218, 6);
+            this.numericUpDownApplicationFocusDelayBefore.Location = new System.Drawing.Point(148, 47);
+            this.numericUpDownApplicationFocusDelayBefore.Maximum = new decimal(new int[] {
+            60000,
+            0,
+            0,
+            0});
+            this.numericUpDownApplicationFocusDelayBefore.Name = "numericUpDownApplicationFocusDelayBefore";
+            this.numericUpDownApplicationFocusDelayBefore.Size = new System.Drawing.Size(51, 20);
+            this.numericUpDownApplicationFocusDelayBefore.TabIndex = 0;
+            this.numericUpDownApplicationFocusDelayBefore.TabStop = false;
+            // 
+            // numericUpDownApplicationFocusDelayAfter
+            // 
+            this.numericUpDownApplicationFocusDelayAfter.Location = new System.Drawing.Point(147, 71);
+            this.numericUpDownApplicationFocusDelayAfter.Maximum = new decimal(new int[] {
+            60000,
+            0,
+            0,
+            0});
+            this.numericUpDownApplicationFocusDelayAfter.Name = "numericUpDownApplicationFocusDelayAfter";
+            this.numericUpDownApplicationFocusDelayAfter.Size = new System.Drawing.Size(51, 20);
+            this.numericUpDownApplicationFocusDelayAfter.TabIndex = 3;
+            this.numericUpDownApplicationFocusDelayAfter.TabStop = false;
             // 
             // FormMain
             // 
@@ -1243,6 +1297,7 @@ private void InitializeComponent()
             this.tabPageSetup.ResumeLayout(false);
             this.tabPageSetup.PerformLayout();
             this.groupBoxApplicationFocus.ResumeLayout(false);
+            this.groupBoxApplicationFocus.PerformLayout();
             this.groupBoxRegionSelectAutoSave.ResumeLayout(false);
             this.groupBoxRegionSelectAutoSave.PerformLayout();
             this.groupBoxActiveWindowTitle.ResumeLayout(false);
@@ -1259,6 +1314,8 @@ private void InitializeComponent()
             this.tabPageScreenshots.ResumeLayout(false);
             this.tabPageScreenshots.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownKeepScreenshotsForDays)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownApplicationFocusDelayBefore)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownApplicationFocusDelayAfter)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1365,5 +1422,9 @@ private void InitializeComponent()
         private Button buttonApplicationFocusTest;
         private Button buttonApplicationFocusRefresh;
         private ToolStripSeparator toolStripSeparatorScreenCapture;
+        private Label labelApplicationFocusDelayAfter;
+        private Label labelApplicationFocusDelayBefore;
+        private NumericUpDown numericUpDownApplicationFocusDelayAfter;
+        private NumericUpDown numericUpDownApplicationFocusDelayBefore;
     }
 }
\ No newline at end of file
diff --git a/interface/main/FormMain.cs b/interface/main/FormMain.cs
index b5223194..ef72cea3 100644
--- a/interface/main/FormMain.cs
+++ b/interface/main/FormMain.cs
@@ -447,12 +447,30 @@ private void checkBoxActiveWindowTitle_CheckedChanged(object sender, EventArgs e
 
         private void buttonApplicationFocusTest_Click(object sender, EventArgs e)
         {
-            ScreenCapture.SetApplicationFocus(comboBoxProcessList.Text);
+            DoApplicationFocus();
         }
 
         private void buttonApplicationFocusRefresh_Click(object sender, EventArgs e)
         {
             RefreshApplicationFocusList();
         }
+
+        private void DoApplicationFocus()
+        {
+            int delayBefore = (int)numericUpDownApplicationFocusDelayBefore.Value;
+            int delayAfter = (int)numericUpDownApplicationFocusDelayAfter.Value;
+
+            if (delayBefore > 0)
+            {
+                System.Threading.Thread.Sleep(delayBefore);
+            }
+
+            ScreenCapture.SetApplicationFocus(comboBoxProcessList.Text);
+
+            if (delayAfter > 0)
+            {
+                System.Threading.Thread.Sleep(delayAfter);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/settings/DefaultSettings.cs b/settings/DefaultSettings.cs
index f5385b06..6c6fe80a 100644
--- a/settings/DefaultSettings.cs
+++ b/settings/DefaultSettings.cs
@@ -81,6 +81,8 @@ public static class DefaultSettings
         internal static readonly string ApplicationFocus = string.Empty;
         internal static readonly string AutoSaveFolder = MacroParser.DefaultAutoSaveFolder;
         internal static readonly string AutoSaveMacro = MacroParser.DefaultAutoSaveMacro;
+        internal static readonly int ApplicationFocusDelayBefore = 0;
+        internal static readonly int ApplicationFocusDelayAfter = 0;
 
         // Keyboard Shortcuts.
         internal static readonly bool UseKeyboardShortcuts = false;
diff --git a/settings/Settings.cs b/settings/Settings.cs
index e6e597f9..c826234b 100644
--- a/settings/Settings.cs
+++ b/settings/Settings.cs
@@ -175,6 +175,7 @@ public static void Initialize()
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.3.1")); // New command line arguments -activeWindowTitle, -applicationFocus, and -label.
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.3.2")); // Can now run an Editor without arguments or without %filepath% tag when using Run Editor trigger action. Includes changes to version collection, change to how Application Focus behaves when application not found (so now adds the application to the process list regardless), and bug fix applied to threads.
             _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.3.3")); // An internal list of image hash values are stored when emailing screenshots so we do not email duplicate images.
+            _versionCollection.Add(new Version(CODENAME_BOOMBAYAH, "2.3.3.4")); // A bug fix for saving of file when adding screenshot to collection.
 
             Application = new SettingCollection
             {