Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7659 from ZappoMan/newLODSettings

Browse source 
improve reset settings
This commit is contained in:
Chris Collins 2016-04-13 16:49:22 -07:00
commit 47522e1774
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -420,7 +420,7 @@ bool setupEssentials(int& argc, char** argv) {
Setting::preInit();
bool previousSessionCrashed = CrashHandler::checkForAndHandleCrash();
bool previousSessionCrashed = CrashHandler::checkForResetSettings();
CrashHandler::writeRunningMarkerFiler();
qAddPostRoutine(CrashHandler::deleteRunningMarkerFile);

5
interface/src/CrashHandler.cpp
View file

@ -27,7 +27,7 @@
static const QString RUNNING_MARKER_FILENAME = "Interface.running";
bool CrashHandler::checkForAndHandleCrash() {
bool CrashHandler::checkForResetSettings() {
QSettings::setDefaultFormat(QSettings::IniFormat);
QSettings settings;
settings.beginGroup("Developer");
@ -49,9 +49,8 @@ bool CrashHandler::checkForAndHandleCrash() {
handleCrash(action);
}
}
return true;
}
return false;
return wasLikelyCrash;
}
CrashHandler::Action CrashHandler::promptUserForAction(bool showCrashMessage) {

2
interface/src/CrashHandler.h
View file

@ -17,7 +17,7 @@
class CrashHandler {
public:
static bool checkForAndHandleCrash();
static bool checkForResetSettings();
static void writeRunningMarkerFiler();
static void deleteRunningMarkerFile();