Fixing something I broke. Wouldn't load preset files properly

fortressforever · Oct 14, 2020 · 27141c4 · 27141c4
1 parent 3f19331
commit 27141c4
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/cl_dll/ff/vgui/ff_optionspresetpage.cpp b/cl_dll/ff/vgui/ff_optionspresetpage.cpp
@@ -61,24 +61,22 @@ namespace vgui {
 		//if no presets were in the file (or file not found)
 		{
 			KeyValues *kvPreset = new KeyValues("global");
-			//use this to remove/add keys using defaults
-			kvPreset = RemoveNonEssentialValues(kvPreset);
-			m_pPresets->AddItem("#GameUI_Global", kvPreset);
+			//use RemoveNonEssentialValues to remove/add keys using defaults
+			m_pPresets->AddItem("#GameUI_Global", RemoveNonEssentialValues(new KeyValues("global")));
 		}
 		else
 		//if presets exist
 		{
 			for (KeyValues *kvPreset = kvPresets->GetFirstSubKey(); kvPreset != NULL; kvPreset = kvPreset->GetNextKey())
+			{
+				//use RemoveNonEssentialValues to remove/add keys using defaults
+				if(Q_stricmp(kvPreset->GetName(), "global") == 0)
 				{
-			//use this to remove/add keys using defaults
-				kvPreset = RemoveNonEssentialValues(kvPreset);
-				if(Q_strncmp(kvPreset->GetName(), "global", 7) == 0)
-				{
-					m_pPresets->AddItem("#GameUI_Global", kvPreset); 
+					m_pPresets->AddItem("#GameUI_Global", RemoveNonEssentialValues(kvPreset)); 
 				}
 				else
 				{
-					m_pPresets->AddItem(kvPreset->GetName(), kvPreset);
+					m_pPresets->AddItem(kvPreset->GetName(), RemoveNonEssentialValues(kvPreset));
 				}
 			}
 		}