From 6b7fe4c8f27fc6ad4e454269c43ba0de703b8919 Mon Sep 17 00:00:00 2001
From: Norman Heino <norman.heino@gmail.com>
Date: Sun, 26 May 2019 17:18:42 +0200
Subject: [PATCH 1/2] Fix use-after-free in Profile::UnloadMachineData

---
 oscar/SleepLib/profiles.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp
index bf5c3c15..48e7178d 100644
--- a/oscar/SleepLib/profiles.cpp
+++ b/oscar/SleepLib/profiles.cpp
@@ -581,16 +581,17 @@ void Profile::UnloadMachineData()
         return;
     }
 
-    for (auto & day : daylist) {
-        delete day;
-    }
-    daylist.clear();
-
     for (auto & mach : m_machlist) {
         mach->saveSessionInfo();
         mach->sessionlist.clear();
         mach->day.clear();
     }
+
+    for (auto & day : daylist) {
+        delete day;
+    }
+    daylist.clear();
+
     removeLock();
 }
 void Profile::LoadMachineData(ProgressDialog *progress)

From d2eccabbc728da3a3650b3bfbb06826685695f79 Mon Sep 17 00:00:00 2001
From: Norman Heino <norman.heino@gmail.com>
Date: Mon, 27 May 2019 05:49:03 +0200
Subject: [PATCH 2/2] Fix disabling dark mode on macOS Mojave

---
 Building/MacOS/Info.plist.in | 34 +++++++++++++++++-----------------
 OSCAR_QT.pro                 |  4 ----
 oscar/oscar.pro              |  4 ++++
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Building/MacOS/Info.plist.in b/Building/MacOS/Info.plist.in
index 2d2b4a72..407b487a 100644
--- a/Building/MacOS/Info.plist.in
+++ b/Building/MacOS/Info.plist.in
@@ -2,25 +2,25 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleExecutable</key>
-	<string>OSCAR</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Created by Qt/QMake</string>
-	<key>CFBundleIconFile</key>
+  <key>CFBundleExecutable</key>
+  <string>OSCAR</string>
+  <key>CFBundleGetInfoString</key>
+  <string>Created by Qt/QMake</string>
+  <key>CFBundleIconFile</key>
   <string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
-	<key>CFBundleIdentifier</key>
+  <key>CFBundleIdentifier</key>
   <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>LSMinimumSystemVersion</key>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>LSMinimumSystemVersion</key>
   <string>${MACOSX_DEPLOYMENT_TARGET}</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSSupportsAutomaticGraphicsSwitching</key>
-	<true/>
-	<key>NSRequiresAquaSystemAppearance</key>
-	<true/>
+  <key>NSPrincipalClass</key>
+  <string>NSApplication</string>
+  <key>NSSupportsAutomaticGraphicsSwitching</key>
+  <true/>
+  <key>NSRequiresAquaSystemAppearance</key>
+  <true/>
 </dict>
 </plist>
diff --git a/OSCAR_QT.pro b/OSCAR_QT.pro
index 6a8c3dbb..df4e72bb 100644
--- a/OSCAR_QT.pro
+++ b/OSCAR_QT.pro
@@ -10,7 +10,3 @@ TEMPLATE = subdirs
 SUBDIRS += oscar
 
 CONFIG += ordered
-
-macx: {
-    QMAKE_INFO_PLIST = Building/MacOS/Info.plist.in
-}
diff --git a/oscar/oscar.pro b/oscar/oscar.pro
index de7129bb..a881bbaa 100644
--- a/oscar/oscar.pro
+++ b/oscar/oscar.pro
@@ -457,3 +457,7 @@ test {
         tests/sessiontests.h
 }
 
+# On macOS put a custom Info.plist into the bundle that disables dark mode on Mojave
+macx {
+    QMAKE_INFO_PLIST = "../Building/MacOS/Info.plist.in"
+}