Merge branch 'feature' into main

ruittenb · Oct 2, 2024 · 51b6694 · 51b6694
2 parents af48fa1 + eeffa49
commit 51b6694
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+1.6.15: Fixed crash when error handling after sending applescript command
 1.6.14: Bypass osascript. This eliminates the need for forking a child process
 1.6.13: Fixed switching spaces when clicking to the right of a fullscreen space
 1.6.12: Edit space name directly in preferences

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ The menu shows a list of space names. Selecting one will cause Spaceman to switc
 
 <img src="Images/Menu.png" width="auto" height="auto">
 
-Spaceman switches spaces by sending a keyboard shortcut to Mission Control using `osascript`.
+Spaceman switches spaces by sending a keyboard shortcut to Mission Control using Applescript.
 Note that only the first ten spaces will have shortcut keys assigned.
 For extra spaces, switching will not be available; the status bar icon will flash if
 selected, and the menu option will be disabled.

diff --git a/Spaceman.xcodeproj/project.pbxproj b/Spaceman.xcodeproj/project.pbxproj
@@ -465,7 +465,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.14;
+				CURRENT_PROJECT_VERSION = 1.6.15;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -480,7 +480,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.6.15;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -499,7 +499,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1.6.14;
+				CURRENT_PROJECT_VERSION = 1.6.15;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -514,7 +514,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.6.14;
+				MARKETING_VERSION = 1.6.15;
 				PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Spaceman/Helpers/SpaceSwitcher.swift b/Spaceman/Helpers/SpaceSwitcher.swift
@@ -26,9 +26,10 @@ class SpaceSwitcher {
         DispatchQueue.global(qos: .background).async {
             if let scriptObject = NSAppleScript(source: appleScript) {
                 scriptObject.executeAndReturnError(&error)
-            }
-            if let errorBriefMessage = error![NSAppleScript.errorBriefMessage] as? String {
-                self.alert(msg: "Error launching task: \(errorBriefMessage)\n")
+                if error != nil {
+                    var errorBriefMessage: String = error?[NSAppleScript.errorBriefMessage] as! String
+                    self.alert(msg: "Error launching task: \(errorBriefMessage)\n")
+                }
             }
         }
     }