Merge pull request #7726 from fr500/subsystem

start at the current loaded content dir for subsystem and disk image …
This commit is contained in:
Twinaphex 2018-12-11 05:56:00 +01:00 committed by GitHub
commit 669f16c00c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -521,24 +521,36 @@ int generic_action_ok_displaylist_push(const char *path,
} }
break; break;
case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST: case ACTION_OK_DL_DISK_IMAGE_APPEND_LIST:
filebrowser_clear_type(); {
info.type = type; char game_dir[PATH_MAX_LENGTH];
info.directory_ptr = idx; filebrowser_clear_type();
info_path = settings->paths.directory_menu_content; strlcpy(game_dir, path_get(RARCH_PATH_CONTENT), sizeof(game_dir));
info_label = label; path_basedir(game_dir);
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
info.type = type;
info.directory_ptr = idx;
info_path = !string_is_empty(game_dir) ? game_dir : settings->paths.directory_menu_content;
info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
}
break; break;
case ACTION_OK_DL_SUBSYSTEM_ADD_LIST: case ACTION_OK_DL_SUBSYSTEM_ADD_LIST:
filebrowser_clear_type(); {
if (content_get_subsystem() != type - MENU_SETTINGS_SUBSYSTEM_ADD) char game_dir[PATH_MAX_LENGTH];
content_clear_subsystem(); filebrowser_clear_type();
content_set_subsystem(type - MENU_SETTINGS_SUBSYSTEM_ADD); strlcpy(game_dir, path_get(RARCH_PATH_CONTENT), sizeof(game_dir));
filebrowser_set_type(FILEBROWSER_SELECT_FILE_SUBSYSTEM); path_basedir(game_dir);
info.type = type;
info.directory_ptr = idx; if (content_get_subsystem() != type - MENU_SETTINGS_SUBSYSTEM_ADD)
info_path = settings->paths.directory_menu_content; content_clear_subsystem();
info_label = label; content_set_subsystem(type - MENU_SETTINGS_SUBSYSTEM_ADD);
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; filebrowser_set_type(FILEBROWSER_SELECT_FILE_SUBSYSTEM);
info.type = type;
info.directory_ptr = idx;
info_path = !string_is_empty(game_dir) ? game_dir : settings->paths.directory_menu_content;
info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
}
break; break;
case ACTION_OK_DL_SUBSYSTEM_LOAD: case ACTION_OK_DL_SUBSYSTEM_LOAD:
{ {