vkconfig: Fix macOS exit crash

Author: christophe-lunarg

vkconfig_cmd/main_doc.cpp

@@ -81,18 +81,17 @@ int run_doc(const CommandLine& command_line) {
     assert(command_line.command == COMMAND_DOC);
     assert(command_line.error == ERROR_NONE);
 
-    Configurator& configurator = Configurator::Get();
-    configurator.Init(CONFIGURATOR_MODE_CMD);
+    ConfiguratorGuard configurator_guard(CONFIGURATOR_MODE_CMD);
 
     switch (command_line.command_doc_arg) {
         case COMMAND_DOC_HTML: {
-            return run_doc_html(configurator, command_line);
+            return run_doc_html(configurator_guard.Get(), command_line);
         }
         case COMMAND_DOC_MARKDOWN: {
-            return run_doc_markdown(configurator, command_line);
+            return run_doc_markdown(configurator_guard.Get(), command_line);
         }
         case COMMAND_DOC_SETTINGS: {
-            return run_doc_settings(configurator, command_line);
+            return run_doc_settings(configurator_guard.Get(), command_line);
         }
         default: {
             assert(0);

vkconfig_cmd/main_layers.cpp

@@ -123,24 +123,23 @@ int run_layers(const CommandLine& command_line) {
     assert(command_line.command == COMMAND_LAYERS);
     assert(command_line.error == ERROR_NONE);
 
-    Configurator& configurator = Configurator::Get();
-    configurator.Init(CONFIGURATOR_MODE_CMD);
+    ConfiguratorGuard configurator_guard(CONFIGURATOR_MODE_CMD);
 
     switch (command_line.command_layers_arg) {
         case COMMAND_LAYERS_OVERRIDE: {
-            return RunLayersOverride(configurator, command_line);
+            return RunLayersOverride(configurator_guard.Get(), command_line);
         }
         case COMMAND_LAYERS_SURRENDER: {
-            return RunLayersSurrender(configurator, command_line);
+            return RunLayersSurrender(configurator_guard.Get(), command_line);
         }
         case COMMAND_LAYERS_PATH: {
-            return RunLayersPath(configurator, command_line);
+            return RunLayersPath(configurator_guard.Get(), command_line);
         }
         case COMMAND_LAYERS_LIST: {
-            return RunLayersList(configurator, command_line);
+            return RunLayersList(configurator_guard.Get(), command_line);
         }
         case COMMAND_LAYERS_VERBOSE: {
-            return RunLayersVerbose(configurator, command_line);
+            return RunLayersVerbose(configurator_guard.Get(), command_line);
         }
         default: {
             assert(0);

vkconfig_cmd/main_loader.cpp

@@ -206,27 +206,26 @@ int run_loader(const CommandLine& command_line) {
     assert(command_line.command == COMMAND_LOADER);
     assert(command_line.error == ERROR_NONE);
 
-    Configurator& configurator = Configurator::Get();
-    configurator.Init(CONFIGURATOR_MODE_CMD);
+    ConfiguratorGuard configurator_guard(CONFIGURATOR_MODE_CMD);
 
     switch (command_line.command_loader_arg) {
         case COMMAND_LOADER_OVERRIDE: {
-            return RunLoaderOverride(configurator, command_line);
+            return RunLoaderOverride(configurator_guard.Get(), command_line);
         }
         case COMMAND_LOADER_SURRENDER: {
-            return RunLoaderSurrender(configurator, command_line);
+            return RunLoaderSurrender(configurator_guard.Get(), command_line);
         }
         case COMMAND_LOADER_LIST: {
-            return RunLoaderList(configurator, command_line);
+            return RunLoaderList(configurator_guard.Get(), command_line);
         }
         case COMMAND_LOADER_IMPORT: {
-            return RunLoaderImport(configurator, command_line);
+            return RunLoaderImport(configurator_guard.Get(), command_line);
         }
         case COMMAND_LOADER_EXPORT: {
-            return RunLoaderExport(configurator, command_line);
+            return RunLoaderExport(configurator_guard.Get(), command_line);
         }
         case COMMAND_LOADER_DELETE: {
-            return RunLoaderDelete(configurator, command_line);
+            return RunLoaderDelete(configurator_guard.Get(), command_line);
         }
         default: {
             assert(0);

vkconfig_cmd/main_reset.cpp

@@ -25,8 +25,9 @@
 #include <cassert>
 
 static int RunReset(int argc, char* argv[], bool hard) {
-    Configurator& configurator = Configurator::Get();
-    configurator.Init(CONFIGURATOR_MODE_CMD);
+    ConfiguratorGuard configurator_guard(CONFIGURATOR_MODE_CMD);
+
+    Configurator& configurator = configurator_guard.Get();
     configurator.Reset(hard);
 
     return 0;

vkconfig_core/configurator.cpp

@@ -39,11 +39,27 @@
 #include <cstdio>
 #include <algorithm>
 
+ConfiguratorGuard::ConfiguratorGuard(ConfiguratorMode mode) {
+    Configurator& configurator = Configurator::Get();
+    configurator.Init(mode);
+}
+
+ConfiguratorGuard::~ConfiguratorGuard() { Configurator::Release(); }
+
+Configurator& ConfiguratorGuard::Get() { return Configurator::Get(); }
+
+static std::unique_ptr<Configurator> configurator = nullptr;
+
 Configurator& Configurator::Get() {
-    static Configurator configurator;
-    return configurator;
+    if (::configurator == nullptr) {
+        ::configurator.reset(new Configurator);
+    }
+
+    return *::configurator;
 }
 
+void Configurator::Release() { ::configurator.reset(); }
+
 Configurator::Configurator() : mode(init_mode) {}
 
 Configurator::~Configurator() {

vkconfig_core/configurator.h

@@ -67,6 +67,7 @@ class Configurator {
     };
 
     static Configurator& Get();
+    static void Release();
     bool Init(ConfiguratorMode mode);
 
    public:
@@ -160,3 +161,10 @@ class Configurator {
     ExecutableScope executable_scope = EXECUTABLE_ANY;
     std::string selected_global_configuration = "Validation";
 };
+
+struct ConfiguratorGuard {
+    ConfiguratorGuard(ConfiguratorMode mode);
+    ~ConfiguratorGuard();
+
+    Configurator& Get();
+};

vkconfig_gui/main.cpp

@@ -153,9 +153,13 @@ int main(int argc, char* argv[]) {
     configurator.Surrender(OVERRIDE_AREA_ALL);
 
     if (configurator.reset_hard) {
+        configurator.Release();
+
         singleton.Release();
 
         QProcess::startDetached(qApp->arguments()[0], qApp->arguments());
+    } else {
+        configurator.Release();
     }
 
     return result;

vkconfig_gui/mainwindow.cpp

@@ -90,7 +90,7 @@ void MainWindow::commitDataRequest(QSessionManager &manager) {
     Configurator &configurator = Configurator::Get();
     configurator.Surrender(OVERRIDE_AREA_ALL);
 
-    configurator.~Configurator();
+    Configurator::Release();
 }
 
 void MainWindow::UpdateUI(UpdateUIMode mode) {