Merge pull request #168 from fa0311/develop-v6

update 6.2.1

Author: fa0311

DMMGamePlayerFastLauncher/launch.py

@@ -48,6 +48,7 @@ def thread(self, id: str, kill: bool = False, force_non_uac: bool = False):
             self.quit()
         except Exception as e:
             if Env.DEVELOP:
+                self.iconify()
                 raise
             else:
                 self.iconify()
@@ -109,22 +110,22 @@ def launch(self, id: str, kill: bool = False, force_non_uac: bool = False):
             if response["data"]["is_administrator"] and (not is_admin) and (not force_non_uac):
                 process = ProcessManager.admin_run([game_path] + dmm_args, cwd=str(game_file))
                 game_pid = pid_manager.new_process().search(game_full_path)
-                if data.rich_presence.get():
-                    start_rich_presence(game_pid, data.product_id.get(), response["data"]["title"])
                 if data.external_tool_path.get() != "":
                     external_tool_pid_manager = ProcessIdManager()
                     ProcessManager.admin_run([data.external_tool_path.get()], cwd=str(game_file))
                     external_tool_pid = external_tool_pid_manager.new_process().search_or_none(data.external_tool_path.get())
+                if data.rich_presence.get():
+                    start_rich_presence(game_pid, data.product_id.get(), response["data"]["title"])
                 while psutil.pid_exists(game_pid):
                     time.sleep(1)
             else:
                 process = ProcessManager.run([game_path] + dmm_args, cwd=str(game_file))
-                if data.rich_presence.get():
-                    start_rich_presence(process.pid, data.product_id.get(), response["data"]["title"])
                 if data.external_tool_path.get() != "":
                     external_tool_pid_manager = ProcessIdManager()
                     ProcessManager.run([data.external_tool_path.get()], cwd=str(game_file))
                     external_tool_pid = external_tool_pid_manager.new_process().search_or_none(data.external_tool_path.get())
+                if data.rich_presence.get():
+                    start_rich_presence(process.pid, data.product_id.get(), response["data"]["title"])
                 assert process.stdout is not None
                 for line in process.stdout:
                     logging.debug(decode(line))
@@ -138,7 +139,7 @@ def launch(self, id: str, kill: bool = False, force_non_uac: bool = False):
                         start_rich_presence(game_pid, data.product_id.get(), response["data"]["title"])
                     while psutil.pid_exists(game_pid):
                         time.sleep(1)
-            if data.external_tool_path.get() != "":
+            if data.external_tool_path.get() != "" and external_tool_pid is not None:
                 for child in psutil.Process(external_tool_pid).children(recursive=True):
                     child.kill()
 

DMMGamePlayerFastLauncher/lib/process_manager.py

@@ -77,7 +77,7 @@ def new_process(self) -> "ProcessIdManager":
 
     def search(self, name: str) -> int:
         process = [x[0] for x in self.process if x[1] == name]
-        if len(process) != 1:
+        if len(process) == 0:
             raise Exception(f"Process not found: {name}")
         return process[0]
 

DMMGamePlayerFastLauncher/static/env.py

@@ -8,7 +8,7 @@
 
 
 class Env(Dump):
-    VERSION = "v6.2.0"
+    VERSION = "v6.2.1"
     RELEASE_VERSION = requests.get(UrlConfig.RELEASE_API).json().get("tag_name", VERSION)
 
     DEVELOP: bool = os.environ.get("ENV") == "DEVELOP"

setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "DMMGamePlayerFastLauncher"
-#define MyAppVersion "6.2.0"
+#define MyAppVersion "6.2.1"
 #define MyAppPublisher "yuki"
 #define MyAppURL "https://github.com/fa0311/DMMGamePlayerFastLauncher"
 #define MyAppExeName "DMMGamePlayerFastLauncher.exe"