From a9e453110402057d716ab54fbe50072b8893c04f Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sun, 26 May 2019 21:35:15 +0200
Subject: [PATCH] fix 'Reset' and 'Default' for multiple event mappings

---
 src/common/PKeyboardHandler.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index 0503bc7aa..df938c415 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -62,6 +62,8 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
   if (eraseAll)
     // Erase all mappings of given mode
     myKeyMap.eraseMode(mode);
+  else
+    myKeyMap.eraseEvent(event, mode);
 
   auto setDefaultKey = [&](Event::Type k_event, StellaKey key, int mod = KBDM_NONE)
   {
@@ -77,7 +79,6 @@ void PhysicalKeyboardHandler::setDefaultMapping(Event::Type event, EventMode mod
     }
     else if (eraseAll || k_event == event)
     {
-      myKeyMap.eraseEvent(k_event, mode);
       myKeyMap.add(k_event, mode, key, mod);
     }
   };
@@ -345,6 +346,12 @@ bool PhysicalKeyboardHandler::handleAltEvent(StellaKey key, StellaMod mod, bool
     }
     else
 #endif
+
+    if (key == KBDK_RETURN)
+    {
+      int i = 0;
+    }
+
     if(key == KBDK_TAB)
     {
       // Swallow Alt-Tab, but remember that it happened