From ca926f0a50e5759380cdc89b8603224de944271c Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Sat, 28 Jan 2017 22:48:51 -0500
Subject: [PATCH] fix saving for contentless cores

---
 paths.c     | 8 ++++++--
 retroarch.c | 2 --
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/paths.c b/paths.c
index 08ba73fd79..736997df43 100644
--- a/paths.c
+++ b/paths.c
@@ -177,7 +177,9 @@ void path_set_redirect(void)
 
       if (path_is_directory(global->name.savefile))
       {
-         fill_pathname_dir(global->name.savefile, path_main_basename,
+         fill_pathname_dir(global->name.savefile, 
+               !string_is_empty(path_main_basename) ? path_main_basename : 
+                  info->info.library_name,
                file_path_str(FILE_PATH_SRM_EXTENSION),
                sizeof(global->name.savefile));
          RARCH_LOG("%s \"%s\".\n",
@@ -187,7 +189,9 @@ void path_set_redirect(void)
 
       if (path_is_directory(global->name.savestate))
       {
-         fill_pathname_dir(global->name.savestate, path_main_basename,
+         fill_pathname_dir(global->name.savestate, 
+               !string_is_empty(path_main_basename) ? path_main_basename : 
+                  info->info.library_name,
                file_path_str(FILE_PATH_STATE_EXTENSION),
                sizeof(global->name.savestate));
          RARCH_LOG("%s \"%s\".\n",
diff --git a/retroarch.c b/retroarch.c
index 105caa8cd5..4eb66701bf 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1266,8 +1266,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
             bool is_inited   = false;
             content_get_status(&contentless, &is_inited);
 
-            if (contentless)
-               return false;
             path_set_redirect();
          }
          break;