Settings: Remove empty sections before saving

stenzek · stenzek · commit 770bebf3c9bf · 2026-03-14T02:18:34.000+10:00
diff --git a/src/core/core.cpp b/src/core/core.cpp
@@ -277,10 +277,11 @@ bool Core::InitializeBaseSettingsLayer(std::string settings_path, Error* error)
 bool Core::SaveBaseSettingsLayer(Error* error)
 {
   INISettingsInterface& si = s_locals.base_settings_interface;
-  if (si.IsDirty() && !si.Save(error, Settings::GetSectionSaveOrder()))
-    return false;
+  if (!si.IsDirty())
+    return true;
 
-  return true;
+  si.RemoveEmptySections();
+  return si.Save(error, Settings::GetSectionSaveOrder());
 }
 
 void Core::SetDefaultSettings(bool host, bool system, bool controller)

Original file line number	Diff line number	Diff line change
`@@ -277,10 +277,11 @@ bool Core::InitializeBaseSettingsLayer(std::string settings_path, Error* error)`
`277`	`277`	`bool Core::SaveBaseSettingsLayer(Error* error)`
`278`	`278`	`{`
`279`	`279`	`INISettingsInterface& si = s_locals.base_settings_interface;`
`280`		`- if (si.IsDirty() && !si.Save(error, Settings::GetSectionSaveOrder()))`
`281`		`- return false;`
	`280`	`+ if (!si.IsDirty())`
	`281`	`+ return true;`
`282`	`282`
`283`		`- return true;`
	`283`	`+ si.RemoveEmptySections();`
	`284`	`+ return si.Save(error, Settings::GetSectionSaveOrder());`
`284`	`285`	`}`
`285`	`286`
`286`	`287`	`void Core::SetDefaultSettings(bool host, bool system, bool controller)`