Prevent starting conflicting jobs

richinfante · Feb 15, 2019 · edf6184 · edf6184
1 parent b3a2547
commit edf6184
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/shbar2/AppDelegate.swift b/shbar2/AppDelegate.swift
@@ -118,6 +118,8 @@ class ItemConfig : Codable {
     }
 
     @objc func startJob() {
+        self.currentJob?.terminate()
+
         if let script = self.jobScript {
             script.execute (launched: {
                 process in
@@ -180,6 +182,7 @@ class ItemConfig : Codable {
             let subMenu = NSMenu()
             let statusItem = NSMenuItem(title: "stopped", action: nil, keyEquivalent: "")
             self.jobStatusItem = statusItem
+
             let startItem = NSMenuItem(title: "start", action: nil, keyEquivalent: "")
             startItem.action = #selector(ItemConfig.startJob)
             startItem.target = self
@@ -188,9 +191,14 @@ class ItemConfig : Codable {
             stopItem.action = #selector(ItemConfig.stopJob)
             stopItem.target = self
 
+            let restartItem = NSMenuItem(title: "restart", action: nil, keyEquivalent: "")
+            restartItem.action = #selector(ItemConfig.startJob)
+            restartItem.target = self
+
             subMenu.addItem(statusItem)
             subMenu.addItem(startItem)
             subMenu.addItem(stopItem)
+            subMenu.addItem(restartItem)
 
             menuItem.submenu = subMenu