Simplify menu_dialog.c

This commit is contained in:
twinaphex 2016-12-23 16:32:21 +01:00
parent f6ec61b15c
commit ab2ee3c690
2 changed files with 2 additions and 4 deletions

View File

@ -66,7 +66,7 @@ int menu_dialog_iterate(char *s, size_t len, const char *label)
MENU_ENUM_LABEL_WELCOME_TO_RETROARCH,
s, len);
if (rarch_timer_has_expired(&timer))
if (!timer.timer_end && rarch_timer_has_expired(&timer))
{
rarch_timer_end(&timer);
do_exit = true;

View File

@ -165,9 +165,7 @@ bool rarch_timer_is_running(rarch_timer_t *timer)
bool rarch_timer_has_expired(rarch_timer_t *timer)
{
if (!timer)
return true;
if (!timer->timer_end && timer->timeout <= 0)
if (!timer || timer->timeout <= 0)
return true;
return false;
}