Fix loading outside the debugger

kuglee · May 3, 2018 · 4f787f6 · 4f787f6
1 parent a7d53b2
commit 4f787f6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/...codeproj/project.xcworkspace/xcuserdata/kuglee.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/kuglee.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/BatteryExtra/Info.plist b/BatteryExtra/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3</string>
+	<string>1.3.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/BatteryExtra/Loader.swift b/BatteryExtra/Loader.swift
@@ -124,24 +124,26 @@ fileprivate var log: OSLog!
       os_log("Could not load bundle \"%{public}@\"! Quitting...", log: log, type: .error, menuExtraBundlePath)
     }
 
-    do {
-      try swizzle()
-    } catch {
-      switch error {
-      case let SwizzleError.classNotFound(errorMessage):
-        os_log("%{public}@", log: log, type: .error, errorMessage)
-      case let SwizzleError.methodNotFound(errorMessage):
-        os_log("%{public}@", log: log, type: .error, errorMessage)
-      default:
-        os_log("Unexpected error: %{public}@", log: log, type: .error, error as CVarArg)
+    DispatchQueue.main.async {
+      do {
+        try swizzle()
+      } catch {
+        switch error {
+        case let SwizzleError.classNotFound(errorMessage):
+          os_log("%{public}@", log: log, type: .error, errorMessage)
+        case let SwizzleError.methodNotFound(errorMessage):
+          os_log("%{public}@", log: log, type: .error, errorMessage)
+        default:
+          os_log("Unexpected error: %{public}@", log: log, type: .error, error as CVarArg)
+        }
+
+        os_log("Could not swizzle \"%@\"!", log: log, type: .error, Bundle.main.bundleIdentifier!)
+        return
       }
 
-      os_log("Could not swizzle \"%@\"!", log: log, type: .error, Bundle.main.bundleIdentifier!)
-      return
-    }
+      os_log("\"%@\" was swizzled successfully!", log: log, Bundle.main.bundleIdentifier!)
 
-    os_log("\"%@\" was swizzled successfully!", log: log, Bundle.main.bundleIdentifier!)
-
-    reloadMenuExtraIfVisibleOnMenuBar(bundlePath: menuExtraBundlePath)
+      reloadMenuExtraIfVisibleOnMenuBar(bundlePath: menuExtraBundlePath)
+    }
   }
 }
diff --git a/ReloadHelper/Info.plist b/ReloadHelper/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3</string>
+	<string>1.3.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>