mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 03:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2050 from fr500/master

Browse Source 
populate system dir correctly when content dir when it's empty
This commit is contained in:
Twinaphex 2015-08-20 03:30:38 +02:00
commit 46bb793a7b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dynamic.c
View File

@ -755,15 +755,20 @@ bool rarch_environment_cb(unsigned cmd, void *data)
if (settings->system_directory[0] == '\0') if (settings->system_directory[0] == '\0')
{ {
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",global->path.fullpath); RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",global->path.fullpath);
fill_pathname_basedir(buf, global->path.fullpath, fill_pathname_basedir(global->dir.systemdir, global->path.fullpath,
sizeof(buf)); sizeof(global->dir.systemdir));
*(const char**)data = global->dir.systemdir;
RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n",
global->dir.systemdir);
} }
*(const char**)data = *settings->system_directory ? else
settings->system_directory : buf; {
*(const char**)data = settings->system_directory;
RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n", RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n",
settings->system_directory); settings->system_directory);
}
break; break;
case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY: case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY:

1
runloop.h
View File

@ -122,6 +122,7 @@ typedef struct global
/* Used on reentrancy to use a savestate dir. */ /* Used on reentrancy to use a savestate dir. */
char savefile[PATH_MAX_LENGTH]; char savefile[PATH_MAX_LENGTH];
char savestate[PATH_MAX_LENGTH]; char savestate[PATH_MAX_LENGTH];
char systemdir[PATH_MAX_LENGTH];
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
char overlay[PATH_MAX_LENGTH]; char overlay[PATH_MAX_LENGTH];
char osk_overlay[PATH_MAX_LENGTH]; char osk_overlay[PATH_MAX_LENGTH];