From 16187529ea950f3edf842ba1ed9c8261a3706755 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Thu, 28 May 2020 19:05:35 +0200
Subject: [PATCH] merge fixes

---
 ChangeLog       | 3 +++
 mac/activity.h  | 2 +-
 mac/activity.mm | 2 +-
 src/util.cpp    | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2358eda5..5322f1ad 100644
--- a/ChangeLog
+++ b/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)
+
 
 
 
diff --git a/mac/activity.h b/mac/activity.h
index 8f4fa5cb..4f46ba09 100644
--- a/mac/activity.h
+++ b/mac/activity.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  Volker Fischer
+ *  AronVietti
  *
  ******************************************************************************
  *
diff --git a/mac/activity.mm b/mac/activity.mm
index 9fdd2e9d..e9b56da4 100644
--- a/mac/activity.mm
+++ b/mac/activity.mm
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  Volker Fischer
+ *  AronVietti
  *
  ******************************************************************************
  *
diff --git a/src/util.cpp b/src/util.cpp
index df2c7ea8..c6fdd82f 100755
--- a/src/util.cpp
+++ b/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>"