Crash fix for suppressing AppNap on older versions of OS X

ETCLabs · Feb 18, 2016 · 80a0703 · 80a0703
1 parent c29d073
commit 80a0703
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/OSCRouter/EosPlatform_Mac_Native.mm b/OSCRouter/EosPlatform_Mac_Native.mm
@@ -67,14 +67,17 @@ + (id)BeginActivity:(const std::string&)reason error:(std::string&)error
  NSProcessInfo *processInfo = [NSProcessInfo processInfo];
  if(processInfo != nil)
  {
- const char *reasonStr = ((reason.empty() || reason.c_str()==0)
- ? "routing started"
- : reason.c_str());
- activity = [processInfo beginActivityWithOptions:NSActivityUserInitiated|NSActivityLatencyCritical reason:[NSString stringWithUTF8String:reasonStr]];
- if(activity == nil)
- error = "beginActivityWithOptions failed";
- else
- [activity retain];
+ if([processInfo respondsToSelector:@selector(beginActivityWithOptions:reason:)] == YES)
+ {
+ const char *reasonStr = ((reason.empty() || reason.c_str()==0)
+ ? "routing started"
+ : reason.c_str());
+ activity = [processInfo beginActivityWithOptions:NSActivityUserInitiated|NSActivityLatencyCritical reason:[NSString stringWithUTF8String:reasonStr]];
+ if(activity == nil)
+ error = "beginActivityWithOptions failed";
+ else
+ [activity retain];
+ }
  }
  else
  error = "could not get current process";
@@ -95,7 +98,10 @@ + (void)EndActivity:(id)activity
  {
  NSProcessInfo *processInfo = [NSProcessInfo processInfo];
  if(processInfo != nil)
- [processInfo endActivity:activity];
+ {
+ if([processInfo respondsToSelector:@selector(endActivity:)] == YES)
+ [processInfo endActivity:activity];
+ }
 
  [activity release];
  }

diff --git a/OSCRouter/MainWindow.cpp b/OSCRouter/MainWindow.cpp
@@ -33,7 +33,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#define APP_VERSION "0.5"
+#define APP_VERSION "0.6"
 #define SETTING_LOG_DEPTH "LogDepth"
 #define SETTING_FILE_DEPTH "FileDepth"
 #define SETTING_LAST_FILE "LastFile"