changed all event handling to always filter events

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 0a0f1f25b7a22a8092be8511a199641347d6e98c..ab1d2be1188928f23ee4fc54d066a8de9c5fee02 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -5604,12 +5604,10 @@ static Key getSetupKey()
 
   while (!got_key_event)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      WaitEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS:
@@ -6290,12 +6288,10 @@ void CustomizeKeyboard(int player_nr)
 
   while (!finished)
   {
-    if (PendingEvent())                /* got event */
-    {
-      Event event;
-
-      WaitEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
         case EVENT_KEYPRESS: