Clear the event queue between game executions (#325)

CHANGELOG.md

@@ -64,6 +64,7 @@
 * Set current cell when removing a row in input editor so that array keys work (#329)
 * Fix locale names (#267)
 * Fix when savefile was removed and re-opened (#267)
+* Clear the event queue between game executions (#325)
 
 ## [1.3.5] - 2019-11-26
 ### Added

src/program/GameLoop.cpp

@@ -399,6 +399,15 @@ void GameLoop::init()
     else
         context->gamename = context->gamepath;
 
+    /* Clear the event queue and parameters */
+    xcb_generic_event_t *event;
+    do {
+        event = xcb_poll_for_event(context->conn);
+    } while (event);
+
+    last_pressed_key = 0;
+    next_event = nullptr;
+
     /* Remove savestates again in case we did not exist cleanly the previous time */
     remove_savestates(context);
 
@@ -671,9 +680,6 @@ bool GameLoop::startFrameMessages()
 
 uint8_t GameLoop::nextEvent(struct HotKey &hk)
 {
-    static xcb_keycode_t last_pressed_key = 0;
-    static xcb_generic_event_t *next_event = nullptr;
-
     while (true) {
         xcb_generic_event_t *event;
 

src/program/GameLoop.h

@@ -60,6 +60,9 @@ class GameLoop : public QObject {
     int pointer_offset_x;
     int pointer_offset_y;
 
+    xcb_keycode_t last_pressed_key;
+    xcb_generic_event_t *next_event;
+
     void init();
 
     void initProcessMessages();

src/program/ui/MainWindow.cpp

@@ -969,6 +969,9 @@ void MainWindow::updateRecentGamepaths()
 
 void MainWindow::updateUIFrequent()
 {
+    if (context->status != Context::ACTIVE)
+        return;
+
     /* Update frame count */
     frameCount->setValue(context->framecount);
     movieFrameCount->setValue(context->config.sc.movie_framecount);