diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ebfdaff0e3..d83480fa0a 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -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); diff --git a/interface/src/CrashHandler.cpp b/interface/src/CrashHandler.cpp index 14ed8a0382..8de6766c7a 100644 --- a/interface/src/CrashHandler.cpp +++ b/interface/src/CrashHandler.cpp @@ -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) { diff --git a/interface/src/CrashHandler.h b/interface/src/CrashHandler.h index 6b855d04e4..566b780d61 100644 --- a/interface/src/CrashHandler.h +++ b/interface/src/CrashHandler.h @@ -17,7 +17,7 @@ class CrashHandler { public: - static bool checkForAndHandleCrash(); + static bool checkForResetSettings(); static void writeRunningMarkerFiler(); static void deleteRunningMarkerFile();