bug fix for safe connect server (#127)

* bug fix for safe connect server, when _adb._safe_connect:66 raising AdbTimeout, it will be failure. * add error assertion --------- Co-authored-by: ZERTIAN <[email protected]>
openatx · May 27, 2024 · e194766 · e194766
1 parent 9facf46
commit e194766
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/adbutils/_adb.py b/adbutils/_adb.py
@@ -64,10 +64,13 @@ def _create_socket(self):
     def _safe_connect(self):
         try:
             return self._create_socket()
+        except AdbTimeout:
+            pass
         except AdbConnectionError:
-            flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
-            subprocess.run([adb_path(), "start-server"], timeout=20.0, creationflags=flags)  # 20s should enough for adb start
-            return self._create_socket()
+            pass
+        flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
+        subprocess.run([adb_path(), "start-server"], timeout=20.0, creationflags=flags)  # 20s should enough for adb start
+        return self._create_socket()
 
     @property
     def closed(self) -> bool: