[osx] changed, exclude from 10.4 runtime

xbmc · Oct 5, 2011 · 5d57233 · 5d57233
1 parent f338863
commit 5d57233
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/xbmc/osx/HotKeyController.m b/xbmc/osx/HotKeyController.m
@@ -265,24 +265,32 @@ - (id)init
     m_active = NO;
     m_controlSysPower = NO;
     m_controlSysVolume = NO;
-    m_eventPort = CGEventTapCreate(kCGSessionEventTap,
+
-     kCGHeadInsertEventTap, kCGEventTapOptionDefault,
+    if (floor(NSAppKitVersionNumber) < 949)
-     CGEventMaskBit(NX_SYSDEFINED), tapEventCallback, self);
-    if (m_eventPort == NULL)
     {
-      NSLog(@"Fatal Error: Event Tap could not be created");
+      // check runtime, we only allow this on 10.5+
-      return self;
+      m_eventPort = NULL;
+    }
+    else
+    {
+      m_eventPort = CGEventTapCreate(kCGSessionEventTap,
+        kCGHeadInsertEventTap, kCGEventTapOptionDefault,
+        CGEventMaskBit(NX_SYSDEFINED), tapEventCallback, self);
+      if (m_eventPort != NULL)
+      {
+        // Run this in a separate thread so that a slow app
+        // doesn't lag the event tap
+        [NSThread detachNewThreadSelector:@selector(eventTapThread) toTarget:self withObject:nil];
+      }
     }
-
-    // Run this in a separate thread so that a slow app doesn't lag the event tap
-    [NSThread detachNewThreadSelector:@selector(eventTapThread) toTarget:self withObject:nil];
   }
   return self;
 }
 
 - (void)dealloc
 {
-  CFRelease(m_eventPort);
+  if (m_eventPort)
+    CFRelease(m_eventPort);
   [super dealloc];
 }
 @end