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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-06-22 19:57:47 +02:00
parent 4664e56ca3
commit 74e4b05f5a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
retroarch.c
View File

@ -16076,14 +16076,13 @@ static enum runloop_state runloop_check_state(
if (focused || !runloop_idle) if (focused || !runloop_idle)
{ {
bool libretro_running = menu_display_libretro_running( bool core_type_is_dummy = current_core_type == CORE_TYPE_DUMMY;
bool libretro_running = menu_display_libretro_running(
rarch_is_initialized, rarch_is_initialized,
(current_core_type == CORE_TYPE_DUMMY)); core_type_is_dummy);
menu_driver_render(runloop_idle, rarch_is_initialized, menu_driver_render(runloop_idle, rarch_is_initialized,
(current_core_type == CORE_TYPE_DUMMY) core_type_is_dummy);
)
;
if (settings->bools.audio_enable_menu && if (settings->bools.audio_enable_menu &&
!libretro_running) !libretro_running)
audio_driver_menu_sample(); audio_driver_menu_sample();
@ -16149,13 +16148,13 @@ static enum runloop_state runloop_check_state(
bool pressed = BIT256_GET( bool pressed = BIT256_GET(
current_bits, RARCH_MENU_TOGGLE) && current_bits, RARCH_MENU_TOGGLE) &&
!string_is_equal(menu_driver, "null"); !string_is_equal(menu_driver, "null");
bool core_type_is_dummy = current_core_type == CORE_TYPE_DUMMY;
if (menu_keyboard_key_state[RETROK_F1] == 1) if (menu_keyboard_key_state[RETROK_F1] == 1)
{ {
if (menu_driver_is_alive()) if (menu_driver_is_alive())
{ {
if (rarch_is_initialized && if (rarch_is_initialized && !core_type_is_dummy)
(current_core_type != CORE_TYPE_DUMMY))
{ {
rarch_menu_running_finished(); rarch_menu_running_finished();
menu_event_kb_set(false, RETROK_F1); menu_event_kb_set(false, RETROK_F1);
@ -16164,12 +16163,11 @@ static enum runloop_state runloop_check_state(
} }
else if ((!menu_keyboard_key_state[RETROK_F1] && else if ((!menu_keyboard_key_state[RETROK_F1] &&
(pressed && !old_pressed)) || (pressed && !old_pressed)) ||
(current_core_type == CORE_TYPE_DUMMY)) core_type_is_dummy)
{ {
if (menu_driver_is_alive()) if (menu_driver_is_alive())
{ {
if (rarch_is_initialized && if (rarch_is_initialized && !core_type_is_dummy)
(current_core_type != CORE_TYPE_DUMMY))
rarch_menu_running_finished(); rarch_menu_running_finished();
} }
else else