chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 03:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Statistics

Browse Source
This commit is contained in:
Seeker4 2019-05-27 11:24:18 -07:00
commit c438ef3872
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OSCAR_QT.pro
View File

@ -10,7 +10,3 @@ TEMPLATE = subdirs
SUBDIRS += oscar SUBDIRS += oscar
CONFIG += ordered CONFIG += ordered
macx: {
QMAKE_INFO_PLIST = Building/MacOS/Info.plist.in
}

11
oscar/SleepLib/profiles.cpp
View File

@ -581,16 +581,17 @@ void Profile::UnloadMachineData()
return; return;
} }
for (auto & day : daylist) {
delete day;
}
daylist.clear();
for (auto & mach : m_machlist) { for (auto & mach : m_machlist) {
mach->saveSessionInfo(); mach->saveSessionInfo();
mach->sessionlist.clear(); mach->sessionlist.clear();
mach->day.clear(); mach->day.clear();
} }
for (auto & day : daylist) {
delete day;
}
daylist.clear();
removeLock(); removeLock();
} }
void Profile::LoadMachineData(ProgressDialog *progress) void Profile::LoadMachineData(ProgressDialog *progress)

4
oscar/oscar.pro
View File

@ -457,3 +457,7 @@ test {
tests/sessiontests.h 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"
}