Merge pull request #1498 from seleniumbase/two-fixes-for-windows

Two fixes for Windows

Author: mdmintz

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.3.3"
+__version__ = "4.3.4"

seleniumbase/core/browser_launcher.py

@@ -278,9 +278,13 @@ def add_chrome_ext_dir(chrome_options, dir_path):
         if arg.startswith("--load-extension="):
             option_exists = True
             chrome_options.arguments.remove(arg)
-            chrome_options.add_argument("%s,%s" % (arg, dir_path))
+            chrome_options.add_argument(
+                "%s,%s" % (arg, os.path.realpath(dir_path))
+            )
     if not option_exists:
-        chrome_options.add_argument("--load-extension=%s" % dir_path)
+        chrome_options.add_argument(
+            "--load-extension=%s" % os.path.realpath(dir_path)
+        )
     return chrome_options
 
 

seleniumbase/undetected/__init__.py

@@ -440,22 +440,22 @@ def start_session(self, capabilities=None, browser_profile=None):
         )
 
     def quit(self):
-        logger.debug("Closing webdriver")
-        if hasattr(self, "service") and getattr(self.service, "process", None):
-            self.service.process.kill()
         try:
-            if self.reactor and isinstance(self.reactor, Reactor):
-                logger.debug("shutting down reactor")
-                self.reactor.event.set()
-        except Exception:
-            pass
-        try:
-            logger.debug("Killing browser")
+            logger.debug("Terminating the browser")
             os.kill(self.browser_pid, 15)
         except TimeoutError as e:
             logger.debug(e, exc_info=True)
         except Exception:
             pass
+        if hasattr(self, "service") and getattr(self.service, "process", None):
+            logger.debug("Stopping webdriver service")
+            self.service.stop()
+        try:
+            if self.reactor and isinstance(self.reactor, Reactor):
+                logger.debug("Shutting down reactor")
+                self.reactor.event.set()
+        except Exception:
+            pass
         if (
             hasattr(self, "keep_user_data_dir")
             and hasattr(self, "user_data_dir")
@@ -486,10 +486,17 @@ def quit(self):
 
     def __del__(self):
         try:
-            super().quit()
+            if "win32" in PLATFORM:
+                self.stop_client()
+                self.command_executor.close()
+            else:
+                super().quit()
+        except Exception:
+            pass
+        try:
+            self.quit()
         except Exception:
             pass
-        self.quit()
 
     def __enter__(self):
         return self