Implemented launch timeout setting, fixed an issue with settings changes detection

Author: daviunic

86BoxManager/dlgAbout.Designer.cs

@@ -1,6 +1,6 @@
-using System;
+using Microsoft.Win32;
+using System;
 using System.Windows.Forms;
-using Microsoft.Win32;
 
 namespace _86boxManager
 {
@@ -44,25 +44,29 @@ private void btnCancel_Click(object sender, EventArgs e)
         private void btnApply_Click(object sender, EventArgs e)
         {
             SaveSettings();
-            btnApply.Enabled = false;
+            settingsChanged = CheckForChanges();
+            btnApply.Enabled = settingsChanged;
         }
 
         private void btnOK_Click(object sender, EventArgs e)
         {
-            SaveSettings();
+            if (settingsChanged)
+            {
+                SaveSettings();
+            }
             Close();
         }
 
         private void txt_TextChanged(object sender, EventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(txtEXEdir.Text) || string.IsNullOrWhiteSpace(txtCFGdir.Text))
+            if (string.IsNullOrWhiteSpace(txtEXEdir.Text) || string.IsNullOrWhiteSpace(txtCFGdir.Text) || string.IsNullOrWhiteSpace(txtLaunchTimeout.Text))
             {
-                btnOK.Enabled = false;
+                btnApply.Enabled = false;
             }
             else
             {
                 settingsChanged = CheckForChanges();
-                btnOK.Enabled = true;
+                btnApply.Enabled = settingsChanged;
             }
         }
 
@@ -87,6 +91,7 @@ private void SaveSettings()
                 regkey.SetValue("ShowConsole", cbxShowConsole.Checked, RegistryValueKind.DWord);
                 regkey.SetValue("MinimizeToTray", cbxMinimizeTray.Checked, RegistryValueKind.DWord);
                 regkey.SetValue("CloseToTray", cbxCloseTray.Checked, RegistryValueKind.DWord);
+                regkey.SetValue("LaunchTimeout", int.Parse(txtLaunchTimeout.Text), RegistryValueKind.DWord);
                 regkey.Close();
 
                 settingsChanged = CheckForChanges();
@@ -121,6 +126,7 @@ private void LoadSettings()
                     cbxShowConsole.Checked = true;
                     cbxMinimizeTray.Checked = false;
                     cbxCloseTray.Checked = false;
+                    txtLaunchTimeout.Text = "5000";
 
                     SaveSettings(); //This will write the default values to the registry
                 }
@@ -132,18 +138,20 @@ private void LoadSettings()
                     cbxShowConsole.Checked = Convert.ToBoolean(regkey.GetValue("ShowConsole"));
                     cbxMinimizeTray.Checked = Convert.ToBoolean(regkey.GetValue("MinimizeToTray"));
                     cbxCloseTray.Checked = Convert.ToBoolean(regkey.GetValue("CloseToTray"));
+                    txtLaunchTimeout.Text = Convert.ToString(regkey.GetValue("LaunchTimeout"));
                 }
 
                 regkey.Close();
             }
             catch (Exception ex)
             {
-                txtCFGdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\86Box Virtual Machines";
+                txtCFGdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\86Box VMs";
                 txtEXEdir.Text = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + @"\86Box";
                 cbxMinimize.Checked = false;
                 cbxShowConsole.Checked = true;
                 cbxMinimizeTray.Checked = false;
                 cbxCloseTray.Checked = false;
+                txtLaunchTimeout.Text = "5000";
             }
         }
 
@@ -216,6 +224,7 @@ private void ResetSettings()
             cbxShowConsole.Checked = true;
             cbxMinimizeTray.Checked = false;
             cbxCloseTray.Checked = false;
+            txtLaunchTimeout.Text = "5000";
 
             SaveSettings();
             regkey.Close();
@@ -243,7 +252,8 @@ private bool CheckForChanges()
                 cbxMinimize.Checked != Convert.ToBoolean(regkey.GetValue("MinimizeOnVMStart")) ||
                 cbxShowConsole.Checked != Convert.ToBoolean(regkey.GetValue("ShowConsole")) ||
                 cbxMinimizeTray.Checked != Convert.ToBoolean(regkey.GetValue("MinimizeToTray")) ||
-                cbxCloseTray.Checked != Convert.ToBoolean(regkey.GetValue("CloseToTray")));
+                cbxCloseTray.Checked != Convert.ToBoolean(regkey.GetValue("CloseToTray")) || 
+                txtLaunchTimeout.Text != Convert.ToString(regkey.GetValue("LaunchTimeout")));
 
                 return btnApply.Enabled;
             }

86BoxManager/dlgSettings.Designer.cs

@@ -40,6 +40,7 @@ public struct COPYDATASTRUCT
         private string hWndHex = "";  //Window handle of this window  
         private const string ZEROID = "0000000000000000"; //Used for the id parameter of 86Box -H
         private int sortColumn = -1; //For column sorting's asc/desc capability
+        private int launchTimeout = 5000; //Timeout for waiting for 86Box.exe to initialize
 
         public frmMain()
         {
@@ -205,6 +206,7 @@ private void LoadSettings()
                 showConsole = Convert.ToBoolean(regkey.GetValue("ShowConsole"));
                 minimizeTray = Convert.ToBoolean(regkey.GetValue("MinimizeToTray"));
                 closeTray = Convert.ToBoolean(regkey.GetValue("CloseToTray"));
+                launchTimeout = int.Parse(regkey.GetValue("LaunchTimeout").ToString());
             }
             catch (Exception ex)
             {
@@ -224,6 +226,7 @@ private void LoadSettings()
                 showConsole = true;
                 minimizeTray = false;
                 closeTray = false;
+                launchTimeout = 5000;
 
                 //Defaults must also be written to the registry
                 regkey.SetValue("EXEdir", exepath, RegistryValueKind.String);
@@ -232,6 +235,7 @@ private void LoadSettings()
                 regkey.SetValue("ShowConsole", showConsole, RegistryValueKind.DWord);
                 regkey.SetValue("MinimizeToTray", minimizeTray, RegistryValueKind.DWord);
                 regkey.SetValue("CloseToTray", closeTray, RegistryValueKind.DWord);
+                regkey.SetValue("LaunchTimeout", launchTimeout, RegistryValueKind.DWord);
             }
             finally
             {