From ab2ee3c690ffd4f7d51b4dd3d282ad75f8d6a092 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 23 Dec 2016 16:32:21 +0100 Subject: [PATCH] Simplify menu_dialog.c --- menu/widgets/menu_dialog.c | 2 +- performance_counters.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c index de64357a88..86f757fe6b 100644 --- a/menu/widgets/menu_dialog.c +++ b/menu/widgets/menu_dialog.c @@ -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; diff --git a/performance_counters.c b/performance_counters.c index cb0c4a50d7..6425bea0cd 100644 --- a/performance_counters.c +++ b/performance_counters.c @@ -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; }