From b502f9130db16e889f2a851c695a499f773727c7 Mon Sep 17 00:00:00 2001 From: JOhn Date: Tue, 28 Jul 2026 15:24:48 -0400 Subject: [PATCH] update: updated firewall exception handling --- gui/v2/ui/pages/menu_page.py | 4 +++- gui/v2/workers/worker_thread.py | 16 +++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gui/v2/ui/pages/menu_page.py b/gui/v2/ui/pages/menu_page.py index 5904cea..62009aa 100755 --- a/gui/v2/ui/pages/menu_page.py +++ b/gui/v2/ui/pages/menu_page.py @@ -986,6 +986,8 @@ class MenuPage(Page): return self.worker_thread = WorkerThread( 'DISABLE_PROFILE', profile_data=profile_data) + self.worker_thread.text_output.connect( + lambda text: self.update_status.update_status(str(text))) self.worker_thread.finished.connect(self.on_disconnect_done) self.worker_thread.start() @@ -1196,7 +1198,7 @@ class MenuPage(Page): self.popup.show() return - if profile_id < 0: + if profile_id is not None and profile_id < 0: self.DisplayInstallScreen(text) return if is_enabled: diff --git a/gui/v2/workers/worker_thread.py b/gui/v2/workers/worker_thread.py index 4bff62e..b0c0c58 100755 --- a/gui/v2/workers/worker_thread.py +++ b/gui/v2/workers/worker_thread.py @@ -136,11 +136,11 @@ class WorkerThread(QThread): profile, ignore=True, profile_observer=profile_observer) self.text_output.emit("All profiles were successfully disabled") except SudoScript as e: - self.text_output.emit(e) + self.text_output.emit(str(e)) except FirewallError as e: - self.text_output.emit(e) + self.text_output.emit(str(e)) except MissingPreReqs as e: - self.text_output.emit(e) + self.text_output.emit(str(e)) except Exception: self.text_output.emit("An error occurred when disabling profile") finally: @@ -237,10 +237,12 @@ class WorkerThread(QThread): else: self.text_output.emit( f"No profile found with ID: {self.profile_data['id']}") - # except SudoScript as e: - # self.text_output.emit(str(e)) - # except MissingPreReqs as e: - # self.text_output.emit(str(e)) + except SudoScript as e: + self.text_output.emit(str(e)) + except FirewallError as e: + self.text_output.emit(str(e)) + except MissingPreReqs as e: + self.text_output.emit(str(e)) except Exception as e: self.text_output.emit("An error occurred when disabling profile") finally: