Start using dir_system functions

This commit is contained in:
twinaphex 2016-09-17 16:14:25 +02:00
parent 63270de821
commit 4a4c613ee1
4 changed files with 14 additions and 5 deletions

5
dirs.c
View File

@ -81,6 +81,11 @@ char *dir_get_savefile_ptr(void)
return dir_savefile;
}
char *dir_get_system_ptr(void)
{
return dir_system;
}
const char *dir_get_system(void)
{
return dir_system;

2
dirs.h
View File

@ -41,6 +41,8 @@ char *dir_get_savestate_ptr(void);
const char *dir_get_savestate(void);
char *dir_get_system_ptr(void);
const char *dir_get_system(void);
void dir_set_savefile(const char *path);

View File

@ -51,6 +51,7 @@
#include "cores/internal_cores.h"
#include "frontend/frontend_driver.h"
#include "content.h"
#include "dirs.h"
#include "paths.h"
#include "retroarch.h"
#include "runloop.h"
@ -1030,15 +1031,17 @@ bool rarch_environment_cb(unsigned cmd, void *data)
if (runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath) &&
fullpath)
{
char temp_path[PATH_MAX_LENGTH] = {0};
RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",
fullpath);
fill_pathname_basedir(global->dir.systemdir, fullpath,
sizeof(global->dir.systemdir));
fill_pathname_basedir(temp_path, fullpath, sizeof(temp_path));
dir_set_system(temp_path);
}
*(const char**)data = global->dir.systemdir;
*(const char**)data = dir_get_system_ptr();
RARCH_LOG("Environ SYSTEM_DIRECTORY: \"%s\".\n",
global->dir.systemdir);
dir_get_system());
}
else
{

View File

@ -143,7 +143,6 @@ enum runloop_ctl_state
typedef struct rarch_dir
{
/* Used on reentrancy to use a savestate dir. */
char systemdir[PATH_MAX_LENGTH];
#ifdef HAVE_OVERLAY
char osk_overlay[PATH_MAX_LENGTH];
#endif