CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-25 12:17:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Take out ACTION_STATE_FLUSH_INPUT

Browse Source
This commit is contained in:
twinaphex 2014-09-25 06:25:27 +02:00
parent 13ac38324d
commit 15f82cb477
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
general.h
View File

@ -141,7 +141,6 @@ enum action_state
RARCH_ACTION_STATE_MENU_RUNNING, RARCH_ACTION_STATE_MENU_RUNNING,
RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, RARCH_ACTION_STATE_MENU_RUNNING_FINISHED,
RARCH_ACTION_STATE_EXITSPAWN, RARCH_ACTION_STATE_EXITSPAWN,
RARCH_ACTION_STATE_FLUSH_INPUT,
RARCH_ACTION_STATE_QUIT, RARCH_ACTION_STATE_QUIT,
RARCH_ACTION_STATE_FORCE_QUIT, RARCH_ACTION_STATE_FORCE_QUIT,
}; };

10
retroarch.c
View File

@ -2865,11 +2865,6 @@ void rarch_main_set_state(unsigned cmd)
g_extern.lifecycle_state = 0; g_extern.lifecycle_state = 0;
rarch_main_set_state(RARCH_ACTION_STATE_QUIT); rarch_main_set_state(RARCH_ACTION_STATE_QUIT);
break; break;
case RARCH_ACTION_STATE_FLUSH_INPUT:
driver.block_libretro_input_until = g_extern.frame_count + (5);
/* Restore libretro keyboard callback. */
g_extern.system.key_event = g_extern.frontend_key_event;
break;
case RARCH_ACTION_STATE_NONE: case RARCH_ACTION_STATE_NONE:
default: default:
break; break;
@ -3245,7 +3240,10 @@ bool rarch_main_iterate(void)
driver_set_nonblock_state(driver.nonblock_state); driver_set_nonblock_state(driver.nonblock_state);
rarch_main_command(RARCH_CMD_AUDIO_START); rarch_main_command(RARCH_CMD_AUDIO_START);
rarch_main_set_state(RARCH_ACTION_STATE_FLUSH_INPUT);
driver.block_libretro_input_until = g_extern.frame_count + (5);
/* Restore libretro keyboard callback. */
g_extern.system.key_event = g_extern.frontend_key_event;
} }
return true; return true;
} }