merge fixes

ChangeLog

@@ -7,6 +7,9 @@
 
 - added check in acknowledge message, coded by atsampson (#302)
 
+- bug fix: on MacOS declare an activity to ensure the process doesn't get throttled
+  by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23)
+
 
 
 

mac/activity.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  Volker Fischer
+ *  AronVietti
  *
  ******************************************************************************
  *

mac/activity.mm

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  Volker Fischer
+ *  AronVietti
  *
  ******************************************************************************
  *

src/util.cpp

@@ -396,6 +396,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Tarmo Johannes (<a href=""https://github.com/tarmoj"">tarmoj</a>)</p>"
         "<p>mirabilos (<a href=""https://github.com/mirabilos"">mirabilos</a>)</p>"
         "<p>newlaurent62 (<a href=""https://github.com/newlaurent62"">newlaurent62</a>)</p>"
+        "<p>AronVietti (<a href=""https://github.com/AronVietti"">AronVietti</a>)</p>"
         "<p>Emlyn Bolton (<a href=""https://github.com/emlynmac"">emlynmac</a>)</p>"
         "<p>Jos van den Oever (<a href=""https://github.com/vandenoever"">vandenoever</a>)</p>"
         "<p>Tormod Volden (<a href=""https://github.com/tormodvolden"">tormodvolden</a>)</p>"