Boria138/PortProtonQt
3
3
Fork 3
Code Issues 1 Pull Requests Actions Releases 2 Activity

fix(toggleGame): enable PortProton game launch by removing premature return and setting proper process tracking
All checks were successful
Code and build check / Check code (push) Successful in 2m9s
Details
Code and build check / Build with uv (push) Successful in 57s
Details

Browse Source 
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
This commit is contained in:
Boris Yumankulov
2025-06-25 10:56:46 +05:00
parent 1230d85fe6
commit 3f0d259bf0
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
portprotonqt/main_window.py
View File

@ -2072,41 +2072,36 @@ class MainWindow(QMainWindow):
exe_name = os.path.splitext(current_exe)[0] exe_name = os.path.splitext(current_exe)[0]
env_vars = os.environ.copy() env_vars = os.environ.copy()
# Delay disabling gamepad handling to allow rumble to complete
if hasattr(self, 'input_manager'):
QTimer.singleShot(200, self.input_manager.disable_gamepad_handling)
if entry_exec_split[0] == "env" and len(entry_exec_split) > 1 and 'data/scripts/start.sh' in entry_exec_split[1]: if entry_exec_split[0] == "env" and len(entry_exec_split) > 1 and 'data/scripts/start.sh' in entry_exec_split[1]:
env_vars['START_FROM_STEAM'] = '1' env_vars['START_FROM_STEAM'] = '1'
elif entry_exec_split[0] == "flatpak": elif entry_exec_split[0] == "flatpak":
env_vars['START_FROM_STEAM'] = '1' env_vars['START_FROM_STEAM'] = '1'
return
# Запускаем игру # Delay disabling gamepad handling to allow rumble to complete
self.current_running_button = update_button if hasattr(self, 'input_manager'):
self.target_exe = current_exe QTimer.singleShot(200, self.input_manager.disable_gamepad_handling)
exe_name = os.path.splitext(current_exe)[0]
env_vars = os.environ.copy() # Запускаем игру
env_vars['START_FROM_STEAM'] = '1' try:
try: process = subprocess.Popen(entry_exec_split, env=env_vars, shell=False, preexec_fn=os.setsid)
process = subprocess.Popen(entry_exec_split, env=env_vars, shell=False, preexec_fn=os.setsid) self.game_processes.append(process)
self.game_processes.append(process) save_last_launch(exe_name, datetime.now())
save_last_launch(exe_name, datetime.now()) if update_button:
if update_button: update_button.setText(_("Launching"))
update_button.setText(_("Launching")) icon = self.theme_manager.get_icon("stop")
icon = self.theme_manager.get_icon("stop") if isinstance(icon, str):
if isinstance(icon, str): icon = QIcon(icon)
icon = QIcon(icon) elif icon is None:
elif icon is None: icon = QIcon()
icon = QIcon() update_button.setIcon(icon)
update_button.setIcon(icon)
self.checkProcessTimer = QTimer(self)
self.checkProcessTimer.timeout.connect(self.checkTargetExe)
self.checkProcessTimer.start(500)
except Exception as e:
logger.error(f"Failed to launch game {exe_name}: {e}")
QMessageBox.warning(self, _("Error"), _("Failed to launch game: {0}").format(str(e)))
self.checkProcessTimer = QTimer(self)
self.checkProcessTimer.timeout.connect(self.checkTargetExe)
self.checkProcessTimer.start(500)
except Exception as e:
logger.error(f"Failed to launch game {exe_name}: {e}")
QMessageBox.warning(self, _("Error"), _("Failed to launch game: {0}").format(str(e)))
def closeEvent(self, event): def closeEvent(self, event):
"""Завершает все дочерние процессы и сохраняет настройки при закрытии окна.""" """Завершает все дочерние процессы и сохраняет настройки при закрытии окна."""