reorganize the browser exit code into the WebBrowserMode class

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -40,7 +40,6 @@ public partial class FlashpointSecurePlayerGUI : Form {
         private readonly bool oldWindowsVersion = Environment.OSVersion.Version < new Version(6, 1);
 
         private bool activeX = false;
-        private bool webBrowserModeExiting = false;
         private ProcessStartInfo softwareProcessStartInfo = null;
         private bool softwareIsOldCPUSimulator = false;
 
@@ -810,15 +809,7 @@ private void DeactivateMode(TemplateElement templateElement, ErrorDelegate error
                 }
 
                 try {
-                    webBrowserModeExiting = true;
-
-                    IList<WebBrowserMode> webBrowserModes = WebBrowserMode.WebBrowserModes;
-
-                    if (webBrowserModes != null) {
-                        for (int i = 0; i < webBrowserModes.Count; i++) {
-                            webBrowserModes[i].Close();
-                        }
-                    }
+                    WebBrowserMode.DeactivateMode();
                 } finally {
                     modeMutex.ReleaseMutex();
                 }
@@ -1255,12 +1246,6 @@ private void ImportStop(object sender, EventArgs e) {
         }
 
         private void WebBrowserModeExit(object sender, EventArgs e) {
-            if (webBrowserModeExiting) {
-                return;
-            }
-
-            webBrowserModeExiting = true;
-
             // Set Current Directory
             try {
                 Directory.SetCurrentDirectory(Application.StartupPath);

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -382,15 +382,6 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e) {
 
         static private List<WebBrowserMode> webBrowserModes = new List<WebBrowserMode>() { };
 
-        static public IList<WebBrowserMode> WebBrowserModes {
-            get {
-                if (webBrowserModes == null) {
-                    return null;
-                }
-                return webBrowserModes.AsReadOnly();
-            }
-        }
-
         private readonly EventHandler webBrowserModeExit;
 
         private Uri WebBrowserURL { get; set; } = null;
@@ -443,6 +434,21 @@ private void OnWebBrowserModeExit(EventArgs e) {
             eventHandler(this, e);
         }
 
+        static private bool exiting = false;
+
+        static public void DeactivateMode() {
+            // if we are here, we don't want the OnWebBrowserModeExit event to fire
+            // that would cause recursion, because the mode would be deactivated again
+            // instead, we handle the exit ourselves
+            exiting = true;
+
+            if (webBrowserModes != null) {
+                for (int i = 0; i < webBrowserModes.Count; i++) {
+                    webBrowserModes[i].Close();
+                }
+            }
+        }
+
         private bool addressToolStripSpringTextBoxEntered = false;
 
         public void AddressInvalid() {
@@ -666,6 +672,13 @@ private void WebBrowserMode_FormClosing(object sender, FormClosingEventArgs e) {
                 return;
             }
 
+            // code beyond this point is single shot
+            if (exiting) {
+                return;
+            }
+
+            exiting = true;
+
             // stop form closing recursion
             FormClosing -= WebBrowserMode_FormClosing;