mojave fix

Ribster · Jan 6, 2019 · b9f22bb · b9f22bb
1 parent 7991e8e
commit b9f22bb
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 25 deletions.
diff --git a/MacMediaKeyForwarder/AppDelegate.m b/MacMediaKeyForwarder/AppDelegate.m
@@ -335,31 +335,52 @@ - ( void ) applicationDidFinishLaunching : ( NSNotification*) theNotification
     [self updateOptionState];
 
     eventPort = CGEventTapCreate( kCGSessionEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault, CGEventMaskBit(NX_SYSDEFINED), tapEventCallback, (__bridge void * _Nullable)(self));
-    eventPort = CGEventTapCreate( kCGSessionEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault, NX_SYSDEFINEDMASK, tapEventCallback, (__bridge void * _Nullable)(self));
+    if ( eventPort == NULL )
+    {
+    	eventPort = CGEventTapCreate( kCGSessionEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault, NX_SYSDEFINEDMASK, tapEventCallback, (__bridge void * _Nullable)(self));
+	}
 
-    // Check if permission is granted to send AppleEvents to the running app target, and prompt if not set
-    if ( @available(macOS 10.14, *) )
+    if ( eventPort != NULL )
     {
 
-        iTunesApplication *iTunes = [SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes"];
-        SpotifyApplication *spotify = [SBApplication applicationWithBundleIdentifier:@"com.spotify.client"];
-
-        if ( spotify != nil )
-        {
-            NSAppleEventDescriptor *targetAppEventDescriptor = [NSAppleEventDescriptor descriptorWithBundleIdentifier:@"com.spotify.client"];
-            AEDeterminePermissionToAutomateTarget([targetAppEventDescriptor aeDesc], typeWildCard, typeWildCard, true);
-        }
-
-        if ( iTunes != nil )
-        {
-            NSAppleEventDescriptor *targetAppEventDescriptor = [NSAppleEventDescriptor descriptorWithBundleIdentifier:@"com.apple.iTunes"];
-            AEDeterminePermissionToAutomateTarget([targetAppEventDescriptor aeDesc], typeWildCard, typeWildCard, true);
-        }
-    }
-
-    eventPortSource = CFMachPortCreateRunLoopSource( kCFAllocatorSystemDefault, eventPort, 0 );
-
-    [self startEventSession];
+		// Check if permission is granted to send AppleEvents to the running app target, and prompt if not set
+		if ( @available(macOS 10.14, *) )
+		{
+
+			iTunesApplication *iTunes = [SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes"];
+			SpotifyApplication *spotify = [SBApplication applicationWithBundleIdentifier:@"com.spotify.client"];
+
+			if ( spotify != nil )
+			{
+				NSAppleEventDescriptor *targetAppEventDescriptor = [NSAppleEventDescriptor descriptorWithBundleIdentifier:@"com.spotify.client"];
+				AEDeterminePermissionToAutomateTarget([targetAppEventDescriptor aeDesc], typeWildCard, typeWildCard, true);
+			}
+
+			if ( iTunes != nil )
+			{
+				NSAppleEventDescriptor *targetAppEventDescriptor = [NSAppleEventDescriptor descriptorWithBundleIdentifier:@"com.apple.iTunes"];
+				AEDeterminePermissionToAutomateTarget([targetAppEventDescriptor aeDesc], typeWildCard, typeWildCard, true);
+			}
+		}
+
+		eventPortSource = CFMachPortCreateRunLoopSource( kCFAllocatorSystemDefault, eventPort, 0 );
+
+		[self startEventSession];
+
+	}
+	else
+	{
+
+		NSAlert *alert = [[NSAlert alloc] init];
+		[alert setMessageText:@"Error"];
+		[alert setInformativeText:@"Cannot start event listening. Please add Mac Media Key Forwarder to System Preferences/Security and Privacy/Privacy/ Accessibility and Automation submenus"];
+		[alert addButtonWithTitle:@"Ok"];
+		[alert runModal];
+
+		exit(0);
+
+	}
+
 }
 
 - ( void ) startEventSession

diff --git a/MacMediaKeyForwarder/Info.plist b/MacMediaKeyForwarder/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1</string>
+	<string>2.2</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>LSUIElement</key>

diff --git a/README.md b/README.md
@@ -65,7 +65,10 @@ Thank you!!!
 
 ---
 
-**What's new in version 2.1 :**
+**What's new in version 2.2 :**
+- MacOS Mojave 10.14.2 fix, showing notification pop-up if tap cannot be created
+
+*What's new in version 2.1 :*
 - app brings up permission popups if permission is not granted for Accessibility and Automation Target
 
 What's new in version 2.0 :