Move libkrbn_services_register_core_daemons and libkrbn_services_regi…

…ster_core_agents to ServicesMonitor from AppDelegate
pqrs-org · Aug 5, 2024 · 3733d94 · 3733d94
1 parent 558e855
commit 3733d94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/apps/SettingsWindow/src/AppDelegate.swift b/src/apps/SettingsWindow/src/AppDelegate.swift
@@ -113,12 +113,10 @@ public class AppDelegate: NSObject, NSApplicationDelegate {
     NSApp.activate(ignoringOtherApps: true)
 
     //
-    // Register services
+    // Unregister old agents
     //
 
     libkrbn_services_bootout_old_agents()
-    libkrbn_services_register_core_daemons()
-    libkrbn_services_register_core_agents()
   }
 
   public func applicationWillTerminate(_: Notification) {

diff --git a/src/apps/SettingsWindow/src/ServicesMonitor.swift b/src/apps/SettingsWindow/src/ServicesMonitor.swift
@@ -47,6 +47,11 @@ public class ServicesMonitor: ObservableObject {
       }
     }
 
+    // If Karabiner-Elements was manually terminated just before, the agents are in an unregistered state.
+    // So we should enable them once before checking the status.
+    libkrbn_services_register_core_daemons()
+    libkrbn_services_register_core_agents()
+
     // When updating Karabiner-Elements, after the new version is installed, the daemons, agents, and Settings will restart.
     // To prevent alerts from appearing at that time, if the daemons or agents are enabled, wait for the timer to fire for the process startup check.
     // If either the daemons or agents are not enabled, usually when the daemons are not approved, trigger the timer immediately after startup to show the alert right away.