Remove rgui->base_path.

Completely useless and buggy.
This commit is contained in:
Themaister 2014-01-12 21:23:38 +01:00
parent 8d588402af
commit 2ea94aac37
3 changed files with 2 additions and 8 deletions

View File

@ -395,7 +395,6 @@ void menu_init(void)
rarch_fail(1, "menu_init()"); rarch_fail(1, "menu_init()");
} }
strlcpy(rgui->base_path, g_settings.rgui_content_directory, sizeof(rgui->base_path));
rgui->menu_stack = (file_list_t*)calloc(1, sizeof(file_list_t)); rgui->menu_stack = (file_list_t*)calloc(1, sizeof(file_list_t));
rgui->selection_buf = (file_list_t*)calloc(1, sizeof(file_list_t)); rgui->selection_buf = (file_list_t*)calloc(1, sizeof(file_list_t));
file_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0); file_list_push(rgui->menu_stack, "", RGUI_SETTINGS, 0);
@ -821,7 +820,7 @@ static int menu_settings_iterate(void *data, unsigned action)
else if (type == RGUI_SETTINGS_CONFIG) else if (type == RGUI_SETTINGS_CONFIG)
label = g_settings.rgui_config_directory; label = g_settings.rgui_config_directory;
else if (type == RGUI_SETTINGS_DISK_APPEND) else if (type == RGUI_SETTINGS_DISK_APPEND)
label = rgui->base_path; label = g_settings.rgui_content_directory;
const char *dir = NULL; const char *dir = NULL;
unsigned menu_type = 0; unsigned menu_type = 0;
@ -862,7 +861,7 @@ static int menu_settings_iterate(void *data, unsigned action)
&& action == RGUI_ACTION_OK) && action == RGUI_ACTION_OK)
{ {
rgui->defer_core = type == RGUI_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE; rgui->defer_core = type == RGUI_SETTINGS_OPEN_FILEBROWSER_DEFERRED_CORE;
file_list_push(rgui->menu_stack, rgui->base_path, RGUI_FILE_DIRECTORY, rgui->selection_ptr); file_list_push(rgui->menu_stack, g_settings.rgui_content_directory, RGUI_FILE_DIRECTORY, rgui->selection_ptr);
rgui->selection_ptr = 0; rgui->selection_ptr = 0;
rgui->need_refresh = true; rgui->need_refresh = true;
} }
@ -1239,7 +1238,6 @@ static int menu_iterate_func(void *data, unsigned action)
else if (menu_type == RGUI_BROWSER_DIR_PATH) else if (menu_type == RGUI_BROWSER_DIR_PATH)
{ {
strlcpy(g_settings.rgui_content_directory, dir, sizeof(g_settings.rgui_content_directory)); strlcpy(g_settings.rgui_content_directory, dir, sizeof(g_settings.rgui_content_directory));
strlcpy(rgui->base_path, dir, sizeof(rgui->base_path));
menu_flush_stack_type(rgui, RGUI_SETTINGS_PATH_OPTIONS); menu_flush_stack_type(rgui, RGUI_SETTINGS_PATH_OPTIONS);
} }
#ifdef HAVE_SCREENSHOTS #ifdef HAVE_SCREENSHOTS

View File

@ -309,7 +309,6 @@ typedef struct
unsigned scroll_indices_size; unsigned scroll_indices_size;
unsigned scroll_accel; unsigned scroll_accel;
char base_path[PATH_MAX];
char default_glslp[PATH_MAX]; char default_glslp[PATH_MAX];
char default_cgp[PATH_MAX]; char default_cgp[PATH_MAX];

View File

@ -942,10 +942,7 @@ int menu_set_settings(void *data, unsigned setting, unsigned action)
break; break;
case RGUI_BROWSER_DIR_PATH: case RGUI_BROWSER_DIR_PATH:
if (action == RGUI_ACTION_START) if (action == RGUI_ACTION_START)
{
*g_settings.rgui_content_directory = '\0'; *g_settings.rgui_content_directory = '\0';
*rgui->base_path = '\0';
}
break; break;
#ifdef HAVE_SCREENSHOTS #ifdef HAVE_SCREENSHOTS
case RGUI_SCREENSHOT_DIR_PATH: case RGUI_SCREENSHOT_DIR_PATH: