ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Get rid of checks for main_is_init (for load/save CGP)

This commit is contained in:
twinaphex 2013-04-10 13:24:56 +02:00
parent 872c0a8133
commit adbfa4af90
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/menu/rmenu.c
View File

@ -2216,27 +2216,21 @@ static int set_setting_action(uint8_t menu_type, unsigned switchvalue, uint64_t
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
case SHADERMAN_LOAD_CGP: case SHADERMAN_LOAD_CGP:
if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{
if (g_extern.main_is_init)
{ {
menu_stack_push(PRESET_CHOICE); menu_stack_push(PRESET_CHOICE);
filebrowser_set_root_and_ext(filebrowser, EXT_CGP_PRESETS, g_settings.video.shader_dir); filebrowser_set_root_and_ext(filebrowser, EXT_CGP_PRESETS, g_settings.video.shader_dir);
} }
}
if (input & (1ULL << RMENU_DEVICE_NAV_START)) if (input & (1ULL << RMENU_DEVICE_NAV_START))
strlcpy(g_extern.file_state.cgp_path, "", sizeof(g_extern.file_state.cgp_path)); strlcpy(g_extern.file_state.cgp_path, "", sizeof(g_extern.file_state.cgp_path));
break; break;
case SHADERMAN_SAVE_CGP: case SHADERMAN_SAVE_CGP:
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B))) if ((input & (1ULL << RMENU_DEVICE_NAV_LEFT)) || (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) || (input & (1ULL << RMENU_DEVICE_NAV_B)))
{
if (g_extern.main_is_init)
{ {
rmenu_state.osk_param = SHADER_PRESET_FILE; rmenu_state.osk_param = SHADER_PRESET_FILE;
rmenu_state.osk_init = osk_callback_enter_filename_init; rmenu_state.osk_init = osk_callback_enter_filename_init;
rmenu_state.osk_callback = osk_callback_enter_filename; rmenu_state.osk_callback = osk_callback_enter_filename;
} }
}
#endif #endif
break; break;
case SHADERMAN_AUTOSTART_CGP_ON_STARTUP: case SHADERMAN_AUTOSTART_CGP_ON_STARTUP: