From 572330eaa17eb82fe8a9bc39963dc0bad7ad338e Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Fri, 30 Sep 2022 23:44:16 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20Remove=20reference=20to=20single?= =?UTF-8?q?ton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Integrations/Composer/ComposerWindow.swift | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/phpmon/Domain/Integrations/Composer/ComposerWindow.swift b/phpmon/Domain/Integrations/Composer/ComposerWindow.swift index 3822789..d53c003 100644 --- a/phpmon/Domain/Integrations/Composer/ComposerWindow.swift +++ b/phpmon/Domain/Integrations/Composer/ComposerWindow.swift @@ -9,7 +9,6 @@ import Foundation @MainActor class ComposerWindow { - private var menu: MainMenu? private var shouldNotify: Bool! = nil private var completion: ((Bool) -> Void)! = nil private var window: TerminalProgressWindowController? @@ -18,7 +17,6 @@ import Foundation Updates the global dependencies and runs the completion callback when done. */ func updateGlobalDependencies(notify: Bool, completion: @escaping (Bool) -> Void) { - self.menu = MainMenu.shared self.shouldNotify = notify self.completion = completion @@ -31,8 +29,8 @@ import Foundation } PhpEnv.shared.isBusy = true - menu?.setBusyImage() - menu?.rebuild() + MainMenu.shared.setBusyImage() + MainMenu.shared.rebuild() window = TerminalProgressWindowController.display( title: "alert.composer_progress.title".localized, @@ -88,7 +86,6 @@ import Foundation } window = nil removeBusyStatus() - menu = nil completion(true) } } @@ -101,7 +98,6 @@ import Foundation window?.progressView?.labelDescription.stringValue = "alert.composer_failure.info".localized window = nil removeBusyStatus() - menu = nil completion(false) } } @@ -110,8 +106,8 @@ import Foundation private func removeBusyStatus() { PhpEnv.shared.isBusy = false - DispatchQueue.main.async { [self] in - menu?.updatePhpVersionInStatusBar() + DispatchQueue.main.async { + MainMenu.shared.updatePhpVersionInStatusBar() } }