vkconfig: Fix global vk_layer_settings.txt being written when layers are not configured

Change-Id: If49d47f966efc011a9633dd3ca92c06359331c00

Author: christophe-lunarg

vkconfig_core/configurator.cpp

@@ -196,7 +196,7 @@ QJsonObject Configurator::CreateJsonSettingObject(const Configurator::LoaderSett
         json_settings.insert("app_keys", json_app_keys);
     }
 
-    if (this->layers_override_enabled) {
+    if (this->layers_override_enabled || this->mode == CONFIGURATOR_MODE_CMD) {
         json_settings.insert("layers", json_layers);
     }
 

vkconfig_core/generate_layers_settings_file.cpp

@@ -22,7 +22,8 @@
 
 // Create and write vk_layer_settings.txt file
 bool GenerateSettingsTXT(Configurator& configurator, OverrideArea override_area, const Path& layers_settings_path) {
-    if (override_area & OVERRIDE_AREA_LAYERS_SETTINGS_BIT) {
+    if (configurator.mode == CONFIGURATOR_MODE_CMD ||
+        (configurator.layers_override_enabled && (override_area & OVERRIDE_AREA_LAYERS_SETTINGS_BIT))) {
         std::vector<LayersSettings> layers_settings_array;
 
         switch (configurator.GetExecutableScope()) {

vkconfig_gui/tab_configurations.cpp

@@ -1208,7 +1208,7 @@ void TabConfigurations::on_configurations_override_toggled() {
 void TabConfigurations::on_configurations_override_toggled(bool checked) {
     Configurator &configurator = Configurator::Get();
     configurator.layers_override_enabled = checked;
-    configurator.Override(OVERRIDE_AREA_LOADER_SETTINGS_BIT);
+    configurator.Override(OVERRIDE_AREA_ALL);
 
     this->UpdateUI(UPDATE_REBUILD_UI);
 }