From d9819d3aaa63665340dac3589b71759dd39df7e2 Mon Sep 17 00:00:00 2001
From: radius
Date: Sun, 13 Sep 2015 23:26:57 -0500
Subject: fix the last commit, now it loads fine

---
 libretro.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'libretro.c')

diff --git a/libretro.c b/libretro.c
index 789e621..63831a0 100644
--- a/libretro.c
+++ b/libretro.c
@@ -884,10 +884,20 @@ bool retro_load_game(const struct retro_game_info* game)
    Settings.FrameTime = (Settings.PAL ? Settings.FrameTimePAL :
                          Settings.FrameTimeNTSC);
 
-   if(retro_save_directory[0] == '\0')
-      LoadSRAM(S9xGetFilename("srm"));
-   else
+
+   const char *dir = NULL;
+   if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir)
+   {
+      GetBaseName("");
+      snprintf(retro_save_directory,sizeof(retro_save_directory),"%s%c%s.srm",dir,slash,retro_base_name);
+      log_cb(RETRO_LOG_INFO,
+             "SAVE LOCATION: %s\n", retro_save_directory);
+   }
+
+   if(retro_save_directory[0] != '\0')
       LoadSRAM(retro_save_directory);
+   else
+      LoadSRAM(S9xGetFilename("srm"));
 
    struct retro_system_av_info av_info;
    retro_get_system_av_info(&av_info);
@@ -899,16 +909,6 @@ bool retro_load_game(const struct retro_game_info* game)
 #else
    S9xSetPlaybackRate(av_info.timing.sample_rate);
 #endif
-
-   const char *dir = NULL;
-   if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir)
-   {
-      GetBaseName("");
-      snprintf(retro_save_directory,sizeof(retro_save_directory),"%s%c%s.srm",dir,slash,retro_base_name);
-      log_cb(RETRO_LOG_INFO,
-             "SAVE LOCATION: %s\n", retro_save_directory);
-   }
-
    return true;
 }
 
-- 
cgit v1.2.3