Merge pull request #259 from retro-wertz/fix_zlib

[pcsx_rearmed.git] / frontend / libretro.c

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 06b66b1..e5ce194 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1297,10 +1297,7 @@ bool retro_load_game(const struct retro_game_info *info)
                return false;
        }
 
-       /* TODO: Calling SysReset() outside retro_run for some system
-        * causes RetroArch to freeze, e.g Ludo */
-       //SysReset();
-       rebootemu = 1;
+       SysReset();
 
        if (LoadCdrom() == -1) {
                log_cb(RETRO_LOG_INFO, "could not load CD\n");
@@ -1591,7 +1588,8 @@ static void update_variables(bool in_flight)
 
       dfinput_activate();
    }
-   else{
+   else
+   {
       //not yet running
 
       //bootlogo display hack
@@ -1600,10 +1598,13 @@ static void update_variables(bool in_flight)
          var.key = "pcsx_rearmed_show_bios_bootlogo";
          if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
          {
+            Config.SlowBoot = 0;
+            rebootemu = 0;
             if (strcmp(var.value, "enabled") == 0)
+            {
                Config.SlowBoot = 1;
-            else
-               Config.SlowBoot = 0;
+               rebootemu = 1;
+            }
          }
       }
 #ifndef DRC_DISABLE