1 files changed, 2 insertions, 13 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 2c33440fef..69d041f65e 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -163,19 +163,8 @@ int button_get(bool block)
 int button_get_w_tmo(int ticks)
 {
     struct event ev;
-    unsigned int timeout = current_tick + ticks;
-
-    while (TIME_BEFORE( current_tick, timeout ))
-    {
-        if(!queue_empty(&button_queue))
-        {
-            queue_wait(&button_queue, &ev);
-            return ev.id;
-        }
-        yield();
-    }
-
-    return BUTTON_NONE;
+    queue_wait_w_tmo(&button_queue, &ev, ticks);
+    return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE;
 }
 
 #ifdef HAVE_RECORDER_KEYPAD