Merge remote-tracking branch 'upstream/master' into fgfsrate

src/main.cc

@@ -83,7 +83,14 @@ int WindowsCrtReportHook(int reportType, char* message, int* returnValue)
 
 int main(int argc, char *argv[])
 {
-// install the message handler
+
+#ifdef Q_OS_MAC
+    // Prevent Apple's app nap from screwing us over
+    // tip: the domain can be cross-checked on the command line with <defaults domains>
+    QProcess::execute("defaults write org.qgroundcontrol.qgroundcontrol NSAppSleepDisabled -bool YES");
+#endif
+
+    // install the message handler
 #ifdef Q_OS_WIN
     qInstallMsgHandler( msgHandler );
 #endif