mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-26 13:44:19 +02:00
parent 54c3b60603
commit ab2e10fe70
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runloop.c
View File

@ -670,8 +670,8 @@ static int rarch_limit_frame_time(float fastforward_ratio, unsigned *sleep_ms)
frame_limit_last_time += frame_limit_minimum_time; frame_limit_last_time += frame_limit_minimum_time;
return 1; return 1;
} }
else
frame_limit_last_time = retro_get_time_usec(); frame_limit_last_time = retro_get_time_usec();
return 0; return 0;
} }
@ -699,12 +699,12 @@ static bool check_block_hotkey(driver_t *driver, settings_t *settings,
/* If we haven't bound anything to this, /* If we haven't bound anything to this,
* always allow hotkeys. */ * always allow hotkeys. */
use_hotkey_enable = use_hotkey_enable =
bind->key != RETROK_UNKNOWN || (bind->key != RETROK_UNKNOWN)
bind->joykey != NO_BTN || || (bind->joykey != NO_BTN)
bind->joyaxis != AXIS_NONE || || (bind->joyaxis != AXIS_NONE)
autoconf_bind->key != RETROK_UNKNOWN || || (autoconf_bind->key != RETROK_UNKNOWN )
autoconf_bind->joykey != NO_BTN || || (autoconf_bind->joykey != NO_BTN)
autoconf_bind->joyaxis != AXIS_NONE; || (autoconf_bind->joyaxis != AXIS_NONE);
driver->block_hotkey = driver->block_hotkey =
input_driver_keyboard_mapping_is_blocked() || input_driver_keyboard_mapping_is_blocked() ||