From 31e4afa26635f8e9bbb141ba5aa8a1786ed501d8 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Fri, 4 Jan 2019 13:39:00 -0800 Subject: [PATCH] Fix timer in MSC.app that monitors for managedsoftwareupdate failing to start or ending unexpectedly. --- .../Controllers/MSCStatusController.swift | 12 ++++++------ .../MunkiStatus/MunkiStatusViewController.swift | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/apps/Managed Software Center/Managed Software Center/Controllers/MSCStatusController.swift b/code/apps/Managed Software Center/Managed Software Center/Controllers/MSCStatusController.swift index ce8e2e79..942f520e 100644 --- a/code/apps/Managed Software Center/Managed Software Center/Controllers/MSCStatusController.swift +++ b/code/apps/Managed Software Center/Managed Software Center/Controllers/MSCStatusController.swift @@ -16,7 +16,7 @@ class MSCStatusController: NSObject { // Handles status messages from managedsoftwareupdate var session_started = false var got_status_update = false - var timer: Timer? + var timer: Timer? = nil var _status_restartAlertDismissed = false var _status_stopBtnDisabled = false @@ -58,11 +58,11 @@ class MSCStatusController: NSObject { // process failure timeout_counter = 6 saw_process = false - timer = Timer(timeInterval: 5.0, - target: self, - selector: #selector(self.checkProcess), - userInfo: nil, - repeats: true) + timer = Timer.scheduledTimer(timeInterval: 5.0, + target: self, + selector: #selector(self.checkProcess), + userInfo: nil, + repeats: true) } @objc func checkProcess() { diff --git a/code/apps/MunkiStatus/MunkiStatus/MunkiStatusViewController.swift b/code/apps/MunkiStatus/MunkiStatus/MunkiStatusViewController.swift index a8078ef5..c7828143 100644 --- a/code/apps/MunkiStatus/MunkiStatus/MunkiStatusViewController.swift +++ b/code/apps/MunkiStatus/MunkiStatus/MunkiStatusViewController.swift @@ -44,7 +44,7 @@ class MunkiStatusViewController: NSViewController { view.window?.orderFrontRegardless() timer = Timer.scheduledTimer(timeInterval: 5.0, target: self, - selector: #selector(MunkiStatusViewController.checkProcess), + selector: #selector(self.checkProcess), userInfo: nil, repeats: true) }