From ce8cc9f5a0be1ac4f960410a2872f40f58bbc0c0 Mon Sep 17 00:00:00 2001
From: Manuel Martin <manmartin@mozilla.com>
Date: Tue, 12 Dec 2023 11:49:01 +0100
Subject: [PATCH] Selenium instance close fix for Windows

---
 addons/io_hubs_addon/debugger.py | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/addons/io_hubs_addon/debugger.py b/addons/io_hubs_addon/debugger.py
index 330c4f0a..5c2b94e2 100644
--- a/addons/io_hubs_addon/debugger.py
+++ b/addons/io_hubs_addon/debugger.py
@@ -166,7 +166,7 @@ def init_browser(context):
     browser = get_addon_pref(context).browser
     if isWebdriverAlive():
         if web_driver.name != browser.lower():
-            web_driver.quit()
+            close_browser()
             create_browser_instance(context)
             return False
         return True
@@ -175,11 +175,27 @@ def init_browser(context):
         return False
 
 
+def close_browser():
+    global web_driver
+    if web_driver:
+        # Hack, without this the browser instances don't close the session correctly and
+        # you get a "[Browser] didn't shutdown correctly" message on reopen.
+        # Only seen in Windows so far so limiting to it for now.
+        import platform
+        if platform == "windows":
+            windows = web_driver.window_handles
+            for w in windows:
+                web_driver.switch_to.window(w)
+                web_driver.close()
+
+        web_driver.quit()
+        web_driver = None
+
+
 def create_browser_instance(context):
     global web_driver
     if not web_driver or not isWebdriverAlive():
-        if web_driver:
-            web_driver.quit()
+        close_browser()
         browser = get_addon_pref(context).browser
         import os
         file_path = get_browser_profile_directory(browser)
@@ -242,8 +258,7 @@ def execute(self, context):
             return {'FINISHED'}
 
         except Exception as err:
-            if web_driver:
-                web_driver.quit()
+            close_browser()
             bpy.ops.wm.hubs_report_viewer('INVOKE_DEFAULT', title="Hubs scene debugger report",
                                           report_string=f'The room creation has failed: {err}')
             return {"CANCELLED"}
@@ -281,6 +296,7 @@ def execute(self, context):
             return {'FINISHED'}
 
         except Exception as err:
+            close_browser()
             bpy.ops.wm.hubs_report_viewer('INVOKE_DEFAULT', title="Hubs scene debugger report",
                                           report_string=f'An error happened while opening the room: {err}')
             return {"CANCELLED"}
@@ -298,7 +314,7 @@ def poll(cls, context: Context):
 
     def execute(self, context):
         try:
-            web_driver.quit()
+            close_browser()
             return {'FINISHED'}
 
         except Exception as err:
@@ -787,5 +803,4 @@ def unregister():
     if load_post in bpy.app.handlers.load_post:
         bpy.app.handlers.load_post.remove(load_post)
 
-    if web_driver:
-        web_driver.quit()
+    close_browser()