Style nits

This commit is contained in:
twinaphex 2015-03-22 07:52:14 +01:00
parent d3b964a1c2
commit b07e4e40d8

View File

@ -738,7 +738,8 @@ static void rarch_update_frame_time(void)
**/ **/
static void rarch_limit_frame_time(void) static void rarch_limit_frame_time(void)
{ {
retro_time_t target = 0, to_sleep_ms = 0; retro_time_t target = 0;
retro_time_t to_sleep_ms = 0;
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
@ -786,8 +787,10 @@ static bool check_block_hotkey(bool enable_hotkey)
* unless we're really supposed to. */ * unless we're really supposed to. */
driver->block_hotkey = driver->block_input; driver->block_hotkey = driver->block_input;
// If we haven't bound anything to this, always allow hotkeys. /* If we haven't bound anything to this,
use_hotkey_enable = bind->key != RETROK_UNKNOWN || * always allow hotkeys. */
use_hotkey_enable =
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 ||
@ -1009,7 +1012,6 @@ runloop_t *rarch_main_get_ptr(void)
return g_runloop; return g_runloop;
} }
void rarch_main_state_free(void) void rarch_main_state_free(void)
{ {
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
@ -1087,6 +1089,8 @@ void rarch_main_clear_state(void)
bool rarch_main_is_idle(void) bool rarch_main_is_idle(void)
{ {
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
if (!runloop)
return false;
return runloop->is_idle; return runloop->is_idle;
} }