From 23dbf97309e52816596702646f0b0fdb10c890e0 Mon Sep 17 00:00:00 2001 From: SimplifiedPrivacy Date: Mon, 27 Jul 2026 19:55:39 -0400 Subject: [PATCH] Improved Enable and Disable Error Catching. Enable is stable and fully functional. Disable has issues with FirewallError still. --- gui/v2/workers/worker.py | 4 +++- gui/v2/workers/worker_thread.py | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gui/v2/workers/worker.py b/gui/v2/workers/worker.py index 22bd4e2..d729783 100755 --- a/gui/v2/workers/worker.py +++ b/gui/v2/workers/worker.py @@ -11,7 +11,7 @@ from core.controllers.tickets.UseTicketController import ( from core.models.session.SessionProfile import SessionProfile from core.models.system.SystemProfile import SystemProfile from core.models.Result import Result, ResultError -from core.errors.exceptions import SudoScript, MissingPreReqs +from core.errors.exceptions import SudoScript, MissingPreReqs, FirewallError from core.Errors import ( CommandNotFoundError, EndpointVerificationError, @@ -120,6 +120,8 @@ class Worker(QObject): self.update_signal.emit(str(e), False, None, None, None) except MissingPreReqs as e: self.update_signal.emit(str(e), False, None, None, None) + except FirewallError as e: + self.update_signal.emit(str(e), False, None, None, None) except Exception as e: print(e) self.update_signal.emit( diff --git a/gui/v2/workers/worker_thread.py b/gui/v2/workers/worker_thread.py index de37bac..4bff62e 100755 --- a/gui/v2/workers/worker_thread.py +++ b/gui/v2/workers/worker_thread.py @@ -16,7 +16,7 @@ from core.models.session.SessionProfile import SessionProfile from core.models.system.SystemConnection import SystemConnection from core.models.BaseProfile import ProfileType from core.models.system.SystemProfile import SystemProfile -from core.errors.exceptions import SudoScript, MissingPreReqs +from core.errors.exceptions import SudoScript, MissingPreReqs, FirewallError from core.models.Result import Result, ResultError from gui.v2.infrastructure.setup_observers import ( @@ -135,10 +135,12 @@ class WorkerThread(QThread): ProfileController.disable( 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) - # except MissingPreReqs as e: - # self.text_output.emit(e) + except SudoScript as e: + self.text_output.emit(e) + except FirewallError as e: + self.text_output.emit(e) + except MissingPreReqs as e: + self.text_output.emit(e) except Exception: self.text_output.emit("An error occurred when disabling profile") finally: