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

Fix language change crash

Browse Source
This commit is contained in:
Mark Watkins 2018-06-13 01:18:26 +10:00
parent 0d76c5eb9c
commit eb55328b62
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sleepyhead/mainwindow.cpp
View File

@ -514,12 +514,14 @@ void MainWindow::CloseProfile()
overview = nullptr; overview = nullptr;
} }
p_profile->StoreMachines(); if (p_profile) {
p_profile->UnloadMachineData(); p_profile->StoreMachines();
p_profile->saveChannels(); p_profile->UnloadMachineData();
p_profile->Save(); p_profile->saveChannels();
p_profile->removeLock(); p_profile->Save();
p_profile = nullptr; p_profile->removeLock();
p_profile = nullptr;
}
} }
@ -2220,14 +2222,9 @@ void MainWindow::on_actionHelp_Support_SleepyHead_Development_triggered()
void MainWindow::on_actionChange_Language_triggered() void MainWindow::on_actionChange_Language_triggered()
{ {
// Pop up a message box asking if you would like to reset Channel event/waveform names // if (QMessageBox::question(this,STR_MessageBox_Warning,tr("Changing the language will reset custom Event and Waveform names/labels/descriptions.")+"\n\n"+tr("Are you sure you want to do this?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
// Sorry Translators who frequently language hop, this is an extra step, but this one is for the users. :/ // return;
if (QMessageBox::question(this,STR_MessageBox_Warning,tr("Changing the language will reset custom Event and Waveform names/labels/descriptions.")+"\n\n"+tr("Are you sure you want to do this?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { // }
return;
}
CloseProfile();
PREF.Save();
RestartApplication(true, "--language"); RestartApplication(true, "--language");
} }

5
sleepyhead/sleepyhead.pro
View File

@ -127,6 +127,11 @@ win32 {
LIBS += -lz LIBS += -lz
} }
MY_LIB_FILES += $${DESTDIR}/opengl32sw.dll
extra_libs.files = MY_LIB_FILES
extra_libs.path = $$DESTDIR
INSTALLS += extra_libs
CONFIG += precompile_header CONFIG += precompile_header
PRECOMPILED_HEADER = pch.h PRECOMPILED_HEADER = pch.h
HEADERS += pch.h HEADERS += pch.h