1
0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-08 04:20:07 +02:00

🐛 Fix ComposerWindow deinit not firing

This commit is contained in:
2022-09-29 18:50:40 +02:00
parent 5b3054326e
commit 8055a32bde
9 changed files with 18 additions and 12 deletions

View File

@ -30,7 +30,7 @@ class PMWindowController: NSWindowController, NSWindowDelegate {
} }
deinit { deinit {
Log.perf("Window controller '\(windowName)' was deinitialized") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
} }

View File

@ -65,7 +65,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
override init() { override init() {
logger.verbosity = .info logger.verbosity = .info
#if DEBUG #if DEBUG
// logger.verbosity = .performance logger.verbosity = .performance
#endif #endif
if CommandLine.arguments.contains("--v") { if CommandLine.arguments.contains("--v") {
logger.verbosity = .performance logger.verbosity = .performance

View File

@ -292,6 +292,6 @@ class DomainListVC: NSViewController, NSTableViewDelegate, NSTableViewDataSource
// MARK: - Deinitialization // MARK: - Deinitialization
deinit { deinit {
Log.perf("DomainListVC deallocated") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
} }

View File

@ -52,15 +52,15 @@ class ComposerWindow {
} }
task.listen( task.listen(
didReceiveStandardOutputData: { string in didReceiveStandardOutputData: { [weak self] string in
DispatchQueue.main.async { DispatchQueue.main.async {
self.window?.addToConsole(string) self?.window?.addToConsole(string)
} }
// Log.perf("\(string.trimmingCharacters(in: .newlines))") // Log.perf("\(string.trimmingCharacters(in: .newlines))")
}, },
didReceiveStandardErrorData: { string in didReceiveStandardErrorData: { [weak self] string in
DispatchQueue.main.async { DispatchQueue.main.async {
self.window?.addToConsole(string) self?.window?.addToConsole(string)
} }
// Log.perf("\(string.trimmingCharacters(in: .newlines))") // Log.perf("\(string.trimmingCharacters(in: .newlines))")
} }
@ -91,6 +91,7 @@ class ComposerWindow {
} }
window = nil window = nil
removeBusyStatus() removeBusyStatus()
menu = nil
completion(true) completion(true)
} }
} }
@ -103,6 +104,7 @@ class ComposerWindow {
window?.progressView?.labelDescription.stringValue = "alert.composer_failure.info".localized window?.progressView?.labelDescription.stringValue = "alert.composer_failure.info".localized
window = nil window = nil
removeBusyStatus() removeBusyStatus()
menu = nil
completion(false) completion(false)
} }
} }
@ -128,4 +130,8 @@ class ComposerWindow {
.withPrimary(text: "OK") .withPrimary(text: "OK")
.show() .show()
} }
deinit {
Log.perf("deinit: \(String(describing: self)).\(#function)")
}
} }

View File

@ -47,7 +47,7 @@ class BetterAlertVC: NSViewController {
} }
deinit { deinit {
Log.perf("A BetterAlert has been deinitialized.") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
// MARK: Outlet Actions // MARK: Outlet Actions

View File

@ -25,7 +25,7 @@ class GenericPreferenceVC: NSViewController {
// MARK: - Deinitialization // MARK: - Deinitialization
deinit { deinit {
Log.perf("PrefsVC deallocated") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
func getDynamicIconPV() -> NSView { func getDynamicIconPV() -> NSView {

View File

@ -18,7 +18,7 @@ class ProgressViewController: NSViewController {
@IBOutlet weak var imageViewType: NSImageView! @IBOutlet weak var imageViewType: NSImageView!
deinit { deinit {
Log.perf("Deinitializing ProgressViewController") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
} }

View File

@ -56,7 +56,7 @@ class TerminalProgressWindowController: NSWindowController, NSWindowDelegate {
} }
deinit { deinit {
Log.perf("Deinitializing ProgressWindowController") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
} }

View File

@ -68,7 +68,7 @@ class PhpConfigWatcher {
} }
deinit { deinit {
Log.perf("A PhpConfigWatcher has been deinitialized.") Log.perf("deinit: \(String(describing: self)).\(#function)")
} }
} }