cleanup, ( thx Nick )

PSP-Archive · Jun 9, 2024 · dd37a3a · dd37a3a
1 parent 466eda1
commit dd37a3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/extras/menus/arkMenu/include/ark_settings.h b/extras/menus/arkMenu/include/ark_settings.h
@@ -4,6 +4,7 @@
 
 #define FIX_BOOLEAN(c) {c = (c)?1:0;}
 
+
 enum{
     DISABLED,
     ALWAYS_ON,
@@ -489,6 +490,10 @@ settings_entry* ark_conf_entries_adr[] = {
 
 std::vector<string> custom_config;
 
+void cleanupSettings(){
+    custom_config.clear();
+}
+
 bool isComment(string line){
     return (line[0] == '#' || line[0] == ';' || (line[0]=='/'&&line[1]=='/'));
 }
@@ -683,7 +688,7 @@ void loadSettings(){
         }
     }
 
-
+   	cleanupSettings(); 
 
     std::ifstream input((string(ark_config->arkpath)+"SETTINGS.TXT").c_str());
     for( std::string line; getline( input, line ); ){
@@ -772,6 +777,3 @@ void saveSettings(){
     output.close();
 }
 
-void cleanupSettings(){
-    custom_config.clear();
-}
diff --git a/extras/menus/arkMenu/main.cpp b/extras/menus/arkMenu/main.cpp
@@ -103,7 +103,6 @@ int main(int argc, char** argv){
     int max_settings = MAX_SETTINGS_OPTIONS;
     if (common::getPspModel() != PSP_GO) max_settings -= 2;
     SettingsTable stab = { settings_entries, max_settings };
-    settings_menu->setCallbacks(NULL, saveSettings, cleanupSettings);
     entries[n_entries++] = new SettingsMenu(&stab, common::saveConf, false, true, true);
 
     if (recovery){