vkconfig: Fix configuration ordering when resetting

christophe-lunarg · christophe-lunarg · commit f7f202829620 · 2025-05-05T13:58:35.000+02:00
Change-Id: Iee1f89fbae2c5e022bb20c268c292729d952f099
diff --git a/vkconfig_core/configuration_manager.cpp b/vkconfig_core/configuration_manager.cpp
@@ -343,6 +343,9 @@ void ConfigurationManager::ResetDefaultConfigurations(const LayerManager &layers
 
         this->available_configurations[i].Reset(layers);
     }
+
+    this->LoadDefaultConfigurations(layers);
+    this->SortConfigurations();
 }
 
 void ConfigurationManager::RenameConfiguration(const std::string &old_configuration_name,
diff --git a/vkconfig_gui/tab_configurations.cpp b/vkconfig_gui/tab_configurations.cpp
@@ -830,7 +830,6 @@ void TabConfigurations::OnContextMenuResetAllClicked(ListItem *item) {
     }
 
     configurator.configurations.ResetDefaultConfigurations(configurator.layers);
-    configurator.configurations.LoadDefaultConfigurations(configurator.layers);
     configurator.Override(OVERRIDE_AREA_ALL);
 
     this->UpdateUI(UPDATE_REBUILD_UI);

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,9 @@ void ConfigurationManager::ResetDefaultConfigurations(const LayerManager &layers`
`343`	`343`
`344`	`344`	`this->available_configurations[i].Reset(layers);`
`345`	`345`	`}`
	`346`	`+`
	`347`	`+ this->LoadDefaultConfigurations(layers);`
	`348`	`+ this->SortConfigurations();`
`346`	`349`	`}`
`347`	`350`
`348`	`351`	`void ConfigurationManager::RenameConfiguration(const std::string &old_configuration_name,`
Original file line number	Diff line number	Diff line change
`@@ -830,7 +830,6 @@ void TabConfigurations::OnContextMenuResetAllClicked(ListItem *item) {`
`830`	`830`	`}`
`831`	`831`
`832`	`832`	`configurator.configurations.ResetDefaultConfigurations(configurator.layers);`
`833`		`- configurator.configurations.LoadDefaultConfigurations(configurator.layers);`
`834`	`833`	`configurator.Override(OVERRIDE_AREA_ALL);`
`835`	`834`
`836`	`835`	`this->UpdateUI(UPDATE_REBUILD_UI);`