From f6cf77ae689434964ea7b60a5f04494ccead53a4 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 24 Aug 2015 13:24:31 -0700
Subject: [PATCH] Add Developer > Display Crash Options menu item

Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
---
 interface/src/Application.cpp             |  2 ++
 interface/src/CrashHandler.cpp            | 16 +++++++++-------
 interface/src/Menu.cpp                    |  1 +
 interface/src/Menu.h                      |  1 +
 libraries/shared/src/SettingInterface.cpp | 11 +++++++----
 libraries/shared/src/SettingInterface.h   |  1 +
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index ca09960abd..6e8c1065c9 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -257,6 +257,8 @@ bool setupEssentials(int& argc, char** argv) {
     // Set build version
     QCoreApplication::setApplicationVersion(BUILD_VERSION);
 
+    Setting::preInit();
+
     CrashHandler::checkForAndHandleCrash();
     CrashHandler::writeRunningMarkerFiler();
     qAddPostRoutine(CrashHandler::deleteRunningMarkerFile);
diff --git a/interface/src/CrashHandler.cpp b/interface/src/CrashHandler.cpp
index b58e739176..c64aa3d201 100644
--- a/interface/src/CrashHandler.cpp
+++ b/interface/src/CrashHandler.cpp
@@ -22,14 +22,20 @@
 #include <QStandardPaths>
 #include <QVBoxLayout>
 
+#include "Menu.h"
+
 static const QString RUNNING_MARKER_FILENAME = "Interface.running";
 
 void CrashHandler::checkForAndHandleCrash() {
     QFile runningMarkerFile(runningMarkerFilePath());
     if (runningMarkerFile.exists()) {
-        Action action = promptUserForAction();
-        if (action != DO_NOTHING) {
-            handleCrash(action);
+        QSettings settings;
+        settings.beginGroup("Developer");
+        if (settings.value(MenuOption::DisplayCrashOptions).toBool()) {
+            Action action = promptUserForAction();
+            if (action != DO_NOTHING) {
+                handleCrash(action);
+            }
         }
     }
 }
@@ -93,9 +99,5 @@ void CrashHandler::deleteRunningMarkerFile() {
 }
 
 const QString CrashHandler::runningMarkerFilePath() {
-    QSettings::setDefaultFormat(QSettings::IniFormat);
-    QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
-    applicationInfo.beginGroup("INFO");
-    QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
     return QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + RUNNING_MARKER_FILENAME;
 }
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index d08970a693..8c86d47710 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -575,6 +575,7 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned);
     addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);
 
+    addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::DisplayCrashOptions, 0, true);
     addActionToQMenuAndActionHash(developerMenu, MenuOption::CrashInterface, 0, qApp, SLOT(crashApplication()));
 
     MenuWrapper* helpMenu = addMenu("Help");
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index e9ce8bcaba..f81a38872e 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -173,6 +173,7 @@ namespace MenuOption {
     const QString DisableLightEntities = "Disable Light Entities";
     const QString DisableNackPackets = "Disable Entity NACK Packets";
     const QString DiskCacheEditor = "Disk Cache Editor";
+    const QString DisplayCrashOptions = "Display Crash Options";
     const QString DisplayHands = "Show Hand Info";
     const QString DisplayHandTargets = "Show Hand Targets";
     const QString DisplayModelBounds = "Display Model Bounds";
diff --git a/libraries/shared/src/SettingInterface.cpp b/libraries/shared/src/SettingInterface.cpp
index b60ffc0891..b3b9ce32f9 100644
--- a/libraries/shared/src/SettingInterface.cpp
+++ b/libraries/shared/src/SettingInterface.cpp
@@ -35,9 +35,9 @@ namespace Setting {
         settingsManagerThread->quit();
         settingsManagerThread->wait();
     }
-    
-    // Sets up the settings private instance. Should only be run once at startup
-    void init() {
+
+    // Set up application settings. Should only be run once at startup.
+    void preInit() {
         // read the ApplicationInfo.ini file for Name/Version/Domain information
         QSettings::setDefaultFormat(QSettings::IniFormat);
         QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
@@ -46,7 +46,10 @@ namespace Setting {
         QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
         QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
         QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
-        
+    }
+    
+    // Sets up the settings private instance. Should only be run once at startup. preInit() must be run beforehand,
+    void init() {
         // Let's set up the settings Private instance on its own thread
         QThread* thread = new QThread();
         Q_CHECK_PTR(thread);
diff --git a/libraries/shared/src/SettingInterface.h b/libraries/shared/src/SettingInterface.h
index 5092fd09c8..c8b1595a75 100644
--- a/libraries/shared/src/SettingInterface.h
+++ b/libraries/shared/src/SettingInterface.h
@@ -16,6 +16,7 @@
 #include <QVariant>
 
 namespace Setting {
+    void preInit();
     void init();
     void cleanupSettings();