From d52856180a5fc513a2ea50046e40aed6fe8ff117 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Fri, 14 Mar 2025 23:35:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(maa):=20=E4=BA=BA=E5=B7=A5=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=E5=BC=B9=E7=AA=97=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 28938d7..b242302 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -67,11 +67,16 @@ class MaaManager(QObject): self.mode = mode self.config_path = config_path self.user_config_path = user_config_path + self.log_monitor = QFileSystemWatcher() self.log_monitor_timer = QTimer() self.log_monitor_timer.timeout.connect(self.refresh_maa_log) self.monitor_loop = QEventLoop() + self.question_loop = QEventLoop() + self.question_response.connect(self.__capture_response) + self.question_response.connect(self.question_loop.quit) + self.interrupt.connect(self.quit_monitor) with (self.config_path / "config.json").open("r", encoding="utf-8") as f: @@ -562,14 +567,12 @@ class MaaManager(QObject): def push_question(self, title: str, message: str) -> bool: self.question.emit(title, message) - loop = QEventLoop() - self.question_response.connect(self._capture_response) - self.question_response.connect(loop.quit) - loop.exec() + self.question_loop.exec() return self.response - def _capture_response(self, response: bool) -> None: + def __capture_response(self, response: bool) -> None: self.response = response + print(response) def refresh_maa_log(self) -> None: """刷新MAA日志"""