From d164ea7470657a2ab0f2673cb6035f879b7c85e3 Mon Sep 17 00:00:00 2001
From: retro-wertz <retro-wertz@users.noreply.github.com>
Date: Mon, 11 Mar 2019 15:39:57 +0800
Subject: [PATCH] Move some startup variables into retro_load_game

---
 src/drivers/libretro/libretro.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/drivers/libretro/libretro.c b/src/drivers/libretro/libretro.c
index 28e1796..618fb92 100644
--- a/src/drivers/libretro/libretro.c
+++ b/src/drivers/libretro/libretro.c
@@ -875,20 +875,6 @@ void retro_init(void)
    if(environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &rgb565))
       log_cb.log(RETRO_LOG_INFO, "Frontend supports RGB565 - will use that instead of XRGB1555.\n");
 #endif
-
-   /* initialize some of the default variables */
-#ifdef GEKKO
-   sndsamplerate = 32000;
-#else
-   sndsamplerate = 48000;
-#endif
-   sndquality = 0;
-   sndvolume = 150;
-   swapDuty = 0;
-
-   /* Wii: initialize this or else last variable is passed through
-    * when loading another rom causing save state size change. */
-   serialize_size = 0;
 }
 
 static void retro_set_custom_palette(void)
@@ -2053,6 +2039,20 @@ bool retro_load_game(const struct retro_game_info *game)
    if (!game)
       return false;
 
+   /* initialize some of the default variables */
+#ifdef GEKKO
+   sndsamplerate = 32000;
+#else
+   sndsamplerate = 48000;
+#endif
+   sndquality = 0;
+   sndvolume = 150;
+   swapDuty = 0;
+
+   /* Wii: initialize this or else last variable is passed through
+    * when loading another rom causing save state size change. */
+   serialize_size = 0;
+
    var.value = 0;
    var.key = "fceumm_ramstate";