From 1f3fd5cf5b6d9dbc997348cdfdb7dd05c76025d5 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 2 Aug 2014 05:08:52 +0200 Subject: [PATCH] Refactor load_save_files --- retroarch.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/retroarch.c b/retroarch.c index 8824be412c..0ec18d48a7 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1306,14 +1306,16 @@ static void init_controllers(void) } } -static inline void load_save_files(void) +static inline bool load_save_files(void) { unsigned i; - if (!g_extern.savefiles) - return; + if (!g_extern.savefiles || g_extern.sram_load_disable) + return false; for (i = 0; i < g_extern.savefiles->size; i++) load_ram_file(g_extern.savefiles->elems[i].data, g_extern.savefiles->elems[i].attr.i); + + return true; } static inline void save_files(void) @@ -2983,9 +2985,7 @@ int rarch_main_init(int argc, char *argv[]) set_savestate_auto_index(); - if (!g_extern.sram_load_disable) - load_save_files(); - else + if (load_save_files()) RARCH_LOG("Skipping SRAM load.\n"); load_auto_state();