Merge branch 'dhkatz:master' into master

VensGTH · Sep 16, 2024 · d567637 · d567637
2 parents 7524ea2 + 7db7646
commit d567637
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-548.0
+548.2
diff --git a/t5de/Client.py b/t5de/Client.py
@@ -88,10 +88,12 @@ def install(self, download=False):
             attempts += 1
             try:
                 if autogui.exists('Update Available'):
-                    autogui.setWindow('Update Available')
-                    autogui.click('Close', 0, 4)
+                    print('SKIPPING: UPDATE AVAILABLE PROMPT')
+                    autogui.setWindow('Update Available', timeout=4)
+                    autogui.click('Close', timeout=4)
+                    time.sleep(5)
                 autogui.setWindow('IMVU Login')
-                autogui.click('Close', 0, 4)
+                autogui.click('Close', timeout=4)
                 break
             except Exception:
                 if attempts > 5:
@@ -193,7 +195,11 @@ def diff(self, generators, version=None):
 
         executable = os.path.join(self.cwd, 'InstallIMVU_%s.exe' % version)
         if os.path.isfile(executable):
-            os.remove(executable)
+            try:
+                os.remove(executable)
+            except Exception as e:
+                print('ERROR: {}'.format(e))
+                pass
 
     def _latest_version(self):
         """