wmigor/PortProtonQt
1
0
Fork 0
forked from Boria138/PortProtonQt
Code Pull Requests Activity

fix(winetricks): resolve QProcess channel mode warning in install handler

Browse Source 
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
This commit is contained in:
Boris Yumankulov
2025-10-07 15:43:16 +05:00
parent abb2377fb7
commit 7a141d8e46
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
portprotonqt/dialogs.py
View File

@@ -1345,8 +1345,16 @@ class WinetricksDialog(QDialog):
"""Обработчик завершения установки.""" """Обработчик завершения установки."""
error_message = "" error_message = ""
if self.apply_process is not None: if self.apply_process is not None:
error_data = self.apply_process.readAllStandardError().data() # Читаем вывод в зависимости от режима каналов
error_message = bytes(error_data).decode('utf-8', 'ignore') if self.apply_process.processChannelMode() == QProcess.ProcessChannelMode.MergedChannels:
# Если каналы объединены, читаем из StandardOutput
output_data = self.apply_process.readAllStandardOutput().data()
error_message = bytes(output_data).decode('utf-8', 'ignore')
else:
# Если каналы разделены, читаем из StandardError
error_data = self.apply_process.readAllStandardError().data()
error_message = bytes(error_data).decode('utf-8', 'ignore')
if exit_code != 0 or exit_status != QProcess.ExitStatus.NormalExit: if exit_code != 0 or exit_status != QProcess.ExitStatus.NormalExit:
logger.error(f"Winetricks install failed: {error_message}") logger.error(f"Winetricks install failed: {error_message}")
QMessageBox.warning(self, _("Error"), _("Installation failed. Check logs.")) QMessageBox.warning(self, _("Error"), _("Installation failed. Check logs."))
@@ -1356,7 +1364,6 @@ class WinetricksDialog(QDialog):
existing = {line.strip() for line in f if line.strip()} existing = {line.strip() for line in f if line.strip()}
else: else:
existing = set() existing = set()
with open(self.log_path, 'a') as f: with open(self.log_path, 'a') as f:
for name in selected: for name in selected:
if name not in existing: if name not in existing: