From 67af3917bc6d358917500bc35f96c8e8a2df14c1 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Wed, 13 Apr 2016 13:18:23 -0700
Subject: [PATCH 1/2] improve reset settings

---
 interface/src/Application.cpp  | 2 +-
 interface/src/CrashHandler.cpp | 4 ++--
 interface/src/CrashHandler.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 43c9813a51..a891eaea41 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -419,7 +419,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..872f5cf02e 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,7 +49,7 @@ bool CrashHandler::checkForAndHandleCrash() {
                 handleCrash(action);
             }
         }
-        return true;
+        return wasLikelyCrash;
     }
     return false;
 }
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();

From 9c437c082469e5b88f48f7601e202e246c776716 Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Wed, 13 Apr 2016 13:36:28 -0700
Subject: [PATCH 2/2] CR feedback

---
 interface/src/CrashHandler.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/interface/src/CrashHandler.cpp b/interface/src/CrashHandler.cpp
index 872f5cf02e..8de6766c7a 100644
--- a/interface/src/CrashHandler.cpp
+++ b/interface/src/CrashHandler.cpp
@@ -49,9 +49,8 @@ bool CrashHandler::checkForResetSettings() {
                 handleCrash(action);
             }
         }
-        return wasLikelyCrash;
     }
-    return false;
+    return wasLikelyCrash;
 }
 
 CrashHandler::Action CrashHandler::promptUserForAction(bool showCrashMessage) {