1 files changed, 13 insertions, 3 deletions

diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c
index 7996af583d..8f21fe4396 100644
--- a/uisimulator/win32/button.c
+++ b/uisimulator/win32/button.c
@@ -40,7 +40,6 @@ static int btn = 0;    /* Hopefully keeps track of currently pressed keys... */
 
 void button_event(int key, bool pressed)
 {
-    bool post = false;
     int new_btn = 0;
     int diff = 0;
     static int count = 0;
@@ -48,6 +47,7 @@ void button_event(int key, bool pressed)
     static int repeat_speed = REPEAT_INTERVAL_START;
     static int repeat_count = 0;
     static bool repeat = false;
+    static bool post = false;
 
     switch (key)
     {
@@ -176,7 +176,8 @@ void button_event(int key, bool pressed)
             {
                 if ( repeat )
                 {
-                    count--;
+                    if (!post)
+                        count--;
                     if (count == 0)
                     {
                         post = true;
@@ -204,9 +205,18 @@ void button_event(int key, bool pressed)
             if ( post )
             {
                 if(repeat)
-                    queue_post(&button_queue, BUTTON_REPEAT | btn, NULL);
+                {
+                    if (queue_empty(&button_queue))
+                    {
+                        queue_post(&button_queue, BUTTON_REPEAT | btn, NULL);
+                        post = false;
+                    }
+                }
                 else
+                {
                     queue_post(&button_queue, btn, NULL);
+                    post = false;
+                }
 
 #ifdef HAVE_REMOTE_LCD
                 if(btn & BUTTON_REMOTE)