Fix saving config in web version (wasm) (#2909)

* Fix saving config in web version (wasm)

[Gemini] The Emscripten logic in src/system/sdl/main.c was using an
uninitialized internal variable FS.syncFSRequests to decide when to sync
the in-memory filesystem to the browser's persistent storage (IDBFS).
Since this variable was always undefined, the sync was never triggered,
causing all changes (including settings) to be lost upon refreshing or
closing the page.

* Save settings when exiting menu

* Makes a distinction between saveConfigCart and saveOptions

* Changed position of functions (saveOptions and initConfig) to pass compilation

* Simplify by saving just "onBackFromOptionsMenu"

* rebuild

Author: imsys

src/studio/config.c

@@ -140,7 +140,7 @@ static void reset(Config* config)
     saveConfig(config, true);
 }
 
-static void save(Config* config)
+static void saveConfigCart(Config* config)
 {
     *config->cart = config->tic->cart;
     readConfig(config);
@@ -192,44 +192,6 @@ static void loadOptions(Config* config)
     }
 }
 
-void initConfig(Config* config, Studio* studio, tic_fs* fs)
-{
-    *config = (Config)
-    {
-        .studio = studio,
-        .tic = getMemory(studio),
-        .cart = realloc(config->cart, sizeof(tic_cartridge)),
-        .save = save,
-        .reset = reset,
-        .fs = fs,
-    };
-
-    setDefault(config);
-
-    // read config.tic
-    {
-        s32 size = 0;
-        u8* data = (u8*)tic_fs_loadroot(fs, CONFIG_TIC_PATH, &size);
-
-        if(data)
-        {
-            update(config, data, size);
-
-            free(data);
-        }
-        else saveConfig(config, false);
-    }
-
-    loadOptions(config);
-
-#if defined(__TIC_LINUX__)
-    // do not load fullscreen option on Linux
-    config->data.options.fullscreen = false;
-#endif
-
-    tic_api_reset(config->tic);
-}
-
 static string data2str(const void* data, s32 size)
 {
     string res;
@@ -287,6 +249,45 @@ static void saveOptions(Config* config)
     tic_fs_saveroot(config->fs, OptionsJsonPath, buf.data, strlen(buf.data), true);
 }
 
+void initConfig(Config* config, Studio* studio, tic_fs* fs)
+{
+    *config = (Config)
+    {
+        .studio = studio,
+        .tic = getMemory(studio),
+        .cart = realloc(config->cart, sizeof(tic_cartridge)),
+        .saveConfigCart = saveConfigCart,
+        .saveOptions = saveOptions,
+        .reset = reset,
+        .fs = fs,
+    };
+
+    setDefault(config);
+
+    // read config.tic
+    {
+        s32 size = 0;
+        u8* data = (u8*)tic_fs_loadroot(fs, CONFIG_TIC_PATH, &size);
+
+        if(data)
+        {
+            update(config, data, size);
+
+            free(data);
+        }
+        else saveConfig(config, false);
+    }
+
+    loadOptions(config);
+
+#if defined(__TIC_LINUX__)
+    // do not load fullscreen option on Linux
+    config->data.options.fullscreen = false;
+#endif
+
+    tic_api_reset(config->tic);
+}
+
 void freeConfig(Config* config)
 {
     saveOptions(config);

src/studio/config.h

@@ -35,7 +35,8 @@ struct Config
     StudioConfig data;
     tic_cartridge* cart;
 
-    void(*save)(Config*);
+    void(*saveConfigCart)(Config*);
+    void(*saveOptions)(Config*);
     void(*reset)(Config*);
 };
 

src/studio/screens/console.c

@@ -2493,7 +2493,7 @@ static CartSaveResult saveCartName(Console* console, const char* name)
         {
             if(strcmp(name, CONFIG_TIC_PATH) == 0)
             {
-                console->config->save(console->config);
+                console->config->saveConfigCart(console->config);
                 studioRomSaved(console->studio);
                 free(buffer);
                 return CART_SAVE_OK;

src/studio/screens/mainmenu.c

@@ -50,6 +50,7 @@ struct StudioMainMenu
     .count = COUNT_OF(((const char*[])__VA_ARGS__))
 
 static void showMainMenu(void* data, s32 pos);
+static void onBackFromOptionsMenu(void* data, s32 pos);
 
 StudioMainMenu* studio_mainmenu_init(Menu *menu, Config *config)
 {
@@ -330,7 +331,7 @@ static const MenuItem OptionMenu[] =
 #endif
     {"SETUP GAMEPAD",       showGamepadMenu},
     {""},
-    {"BACK",            showMainMenu, .back = true},
+    {"BACK",            onBackFromOptionsMenu, .back = true},
 };
 
 static void showOptionsMenu(void* data, s32 pos);
@@ -441,6 +442,15 @@ static inline s32 mainMenuOffset(StudioMainMenu* menu)
     return 1;
 }
 
+static void onBackFromOptionsMenu(void* data, s32 pos)
+{
+    StudioMainMenu* main = data;
+    Config* config = studio_config_get(main->studio);
+    config->saveOptions(config);
+
+    showMainMenu(data, pos);
+}
+
 static void onResumeGame(void* data, s32 pos)
 {
     StudioMainMenu* main = data;
@@ -518,7 +528,7 @@ static void showOptionsMenuPos(void* data, s32 pos)
     StudioMainMenu* main = data;
 
     s32 offset = mainMenuOffset(main);
-    studio_menu_init(main->menu, OptionMenu, COUNT_OF(OptionMenu), pos, MainMenu_Options - offset, showMainMenu, main);
+    studio_menu_init(main->menu, OptionMenu, COUNT_OF(OptionMenu), pos, MainMenu_Options - offset, onBackFromOptionsMenu, main);
 }
 
 static void showOptionsMenu(void* data, s32 pos)

src/studio/studio.c

@@ -711,6 +711,11 @@ const StudioConfig* getConfig(Studio* studio)
     return studio_config(studio);
 }
 
+Config* studio_config_get(Studio* studio)
+{
+    return studio->config;
+}
+
 struct Start* getStartScreen(Studio* studio)
 {
     return studio->start;

src/studio/studio.h

@@ -284,7 +284,9 @@ bool enterWasPressed(Studio* studio);
 bool anyKeyWasPressed(Studio* studio);
 bool ticEnterWasPressed(tic_mem* tic, s32 hold, s32 period);
 
+typedef struct Config Config;
 const StudioConfig* getConfig(Studio* studio);
+Config* studio_config_get(Studio* studio);
 struct Start* getStartScreen(Studio* studio);
 struct Sprite* getSpriteEditor(Studio* studio);
 

src/system/sdl/main.c

@@ -1878,10 +1878,14 @@ static void emsGpuTick()
 
     EM_ASM(
     {
-        if(FS.syncFSRequests == 0 && Module.syncFSRequests)
+        if(!Module.syncing && Module.syncFSRequests)
         {
+            Module.syncing = true;
             Module.syncFSRequests = 0;
-            FS.syncfs(false,function(){});
+            FS.syncfs(false, function()
+            {
+                Module.syncing = false;
+            });
         }
     });
 
@@ -2150,6 +2154,7 @@ s32 main(s32 argc, char **argv)
     (
         {
             Module.syncFSRequests = 0;
+            Module.syncing = false;
 
             var dir = UTF8ToString($0);