From 2277428f52002f9e35d3246d02458915551d61f0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 19 Sep 2016 04:09:27 +0200
Subject: [PATCH] Move more global->savefiles usage to task_save.c

---
 command.c                              | 10 ----------
 command.h                              |  1 -
 frontend/drivers/platform_emscripten.c |  3 ++-
 retroarch.c                            |  3 ++-
 tasks/task_save.c                      | 14 ++++++++++++++
 tasks/tasks_internal.h                 |  2 ++
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/command.c b/command.c
index 9bfeddd3f3..f5f826b54e 100644
--- a/command.c
+++ b/command.c
@@ -2419,16 +2419,6 @@ bool command_event(enum event_command cmd, void *data)
          if (!runloop_ctl(RUNLOOP_CTL_SHADER_DIR_INIT, NULL))
             return false;
          break;
-      case CMD_EVENT_SAVEFILES:
-         {
-            global_t  *global         = global_get_ptr();
-            if (!global->savefiles || !global->sram.use)
-               return false;
-
-            for (i = 0; i < global->savefiles->size; i++)
-               content_save_ram_file(i);
-         }
-         return true;
       case CMD_EVENT_BSV_MOVIE_DEINIT:
          bsv_movie_ctl(BSV_MOVIE_CTL_DEINIT, NULL);
          break;
diff --git a/command.h b/command.h
index 0ff33189be..f07078c671 100644
--- a/command.h
+++ b/command.h
@@ -157,7 +157,6 @@ enum event_command
    CMD_EVENT_SHADER_DIR_DEINIT,
    /* Initializes controllers. */
    CMD_EVENT_CONTROLLERS_INIT,
-   CMD_EVENT_SAVEFILES,
    /* Initializes cheats. */
    CMD_EVENT_CHEATS_INIT,
    /* Deinitializes cheats. */
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 6488ab1767..cfad3f4497 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -39,6 +39,7 @@
 #include "../../retroarch.h"
 #include "../../runloop.h"
 #include "../../command.h"
+#include "../../tasks/tasks_internal.h"
 #include "../../file_path_special.h"
 
 static void emscripten_mainloop(void)
@@ -57,7 +58,7 @@ static void emscripten_mainloop(void)
 
 void cmd_savefiles(void)
 {
-   command_event(CMD_EVENT_SAVEFILES, NULL);
+   event_save_files();
 }
 
 void cmd_save_state(void)
diff --git a/retroarch.c b/retroarch.c
index 1e07363b9f..fd813e4c37 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1149,7 +1149,8 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          command_event(CMD_EVENT_AUTOSAVE_DEINIT, NULL);
 
          command_event(CMD_EVENT_RECORD_DEINIT, NULL);
-         command_event(CMD_EVENT_SAVEFILES, NULL);
+
+         event_save_files();
 
          command_event(CMD_EVENT_REWIND_DEINIT, NULL);
          command_event(CMD_EVENT_CHEATS_DEINIT, NULL);
diff --git a/tasks/task_save.c b/tasks/task_save.c
index f71f314c5b..081e2a83b0 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -837,6 +837,20 @@ bool content_save_ram_file(unsigned slot)
    return true;
 }
 
+bool event_save_files(void)
+{
+   unsigned i;
+   global_t  *global         = global_get_ptr();
+
+   if (!global || !global->savefiles || !global->sram.use)
+      return false;
+
+   for (i = 0; i < global->savefiles->size; i++)
+      content_save_ram_file(i);
+
+   return true;
+}
+
 bool event_load_save_files(void)
 {
    unsigned i;
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 5f39f820ab..921a2eb650 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -148,6 +148,8 @@ bool dump_to_file_desperate(const void *data,
 
 bool event_load_save_files(void);
 
+bool event_save_files(void);
+
 RETRO_END_DECLS
 
 #endif