fix a bug that causes a crash if saving to HDD for the first time

ps2homebrew · Dec 9, 2019 · cbfab5e · cbfab5e
1 parent 2bd249a
commit cbfab5e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/config.c b/src/config.c
@@ -164,13 +164,17 @@ char *configGetDir(void)
 void configPrepareNotifications(char *prefix)
 {
     int mcID;
+    char *colpos;
 
     snprintf(cfgDevice, sizeof(cfgDevice), prefix);
     if (!strncmp(cfgDevice, "mc?", 3)) {
         mcID = getmcID();
         cfgDevice[2] = mcID;
     }
 
+    if ((colpos = strchr(cfgDevice, ':')) != NULL)
+        *(colpos + 1) = '\0';
+
     showCfgPopup = 1;
 }
 
@@ -206,6 +210,8 @@ void configSetMove(char *prefix)
         snprintf(path, sizeof(path), "%s/%s", prefix, configFilenames[i]);
         configMove(&configFiles[i], path);
     }
+
+    configPrepareNotifications(prefix);
 }
 
 void configEnd()

diff --git a/src/guigame.c b/src/guigame.c
@@ -42,7 +42,7 @@ static char altStartup[32];
 static char vmc1[32];
 static char vmc2[32];
 static char hexDiscID[15];
-static char configSource[32];
+static char configSource[128];
 
 // forward declarations.
 static void guiGameLoadGSMConfig(config_set_t *configSet, config_set_t *configGame);

diff --git a/src/opl.c b/src/opl.c
@@ -957,8 +957,7 @@ int loadConfig(int types)
 
 int saveConfig(int types, int showUI)
 {
-    char notification[32];
-    char *col_pos;
+    char notification[128];
     lscstatus = types;
     lscret = 0;
 
@@ -971,8 +970,6 @@ int saveConfig(int types, int showUI)
                 checkMCFolder();
 
             snprintf(notification, sizeof(notification), _l(_STR_SETTINGS_SAVED), path);
-            if ((col_pos = strchr(notification, ':')) != NULL)
-                *(col_pos + 1) = '\0';
 
             guiMsgBox(notification, 0, NULL);
         }