diff --git a/docs/index.html b/docs/index.html
index f7696d7c0..30013da88 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -4942,7 +4942,7 @@ Ms Pac-Man (Stella extended codes):
| UASW | 8K UA Ltd. (swapped banks) | .UASW |
| WD | Wickstead Design (Pink Panther) | .WD |
| WDSW | Wickstead Design (Pink Panther) (bad) | .WDSW |
- | X07 ¹ | 64K AtariAge | .X07 |
+ | X07 | 64K AtariAge | .X07 |
diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx
index 0fdc28fb5..088fb26db 100644
--- a/src/debugger/gui/DebuggerDialog.cxx
+++ b/src/debugger/gui/DebuggerDialog.cxx
@@ -137,90 +137,93 @@ void DebuggerDialog::handleKeyDown(StellaKey key, StellaMod mod, bool repeated)
}
}
- // handle emulation keys second (can be remapped)
- const Event::Type event = instance().eventHandler().eventForKey(EventMode::kEmulationMode, key, mod);
- switch (event)
+ // Do not handle emulation events which have the same mapping as menu events
+ if(instance().eventHandler().eventForKey(EventMode::kMenuMode, key, mod) == Event::NoType)
{
- case Event::ExitMode:
- // make consistent, exit debugger on key UP
- if(!repeated)
- myExitPressed = true;
- return;
+ // handle emulation keys second (can be remapped)
+ const Event::Type event = instance().eventHandler().eventForKey(EventMode::kEmulationMode, key, mod);
+ switch(event)
+ {
+ case Event::ExitMode:
+ // make consistent, exit debugger on key UP
+ if(!repeated)
+ myExitPressed = true;
+ return;
- // events which can be handled 1:1
- case Event::ToggleP0Collision:
- case Event::ToggleP0Bit:
- case Event::ToggleP1Collision:
- case Event::ToggleP1Bit:
- case Event::ToggleM0Collision:
- case Event::ToggleM0Bit:
- case Event::ToggleM1Collision:
- case Event::ToggleM1Bit:
- case Event::ToggleBLCollision:
- case Event::ToggleBLBit:
- case Event::TogglePFCollision:
- case Event::TogglePFBit:
- case Event::ToggleFixedColors:
- case Event::ToggleCollisions:
- case Event::ToggleBits:
+ // events which can be handled 1:1
+ case Event::ToggleP0Collision:
+ case Event::ToggleP0Bit:
+ case Event::ToggleP1Collision:
+ case Event::ToggleP1Bit:
+ case Event::ToggleM0Collision:
+ case Event::ToggleM0Bit:
+ case Event::ToggleM1Collision:
+ case Event::ToggleM1Bit:
+ case Event::ToggleBLCollision:
+ case Event::ToggleBLBit:
+ case Event::TogglePFCollision:
+ case Event::TogglePFBit:
+ case Event::ToggleFixedColors:
+ case Event::ToggleCollisions:
+ case Event::ToggleBits:
- case Event::ToggleTimeMachine:
+ case Event::ToggleTimeMachine:
- case Event::SaveState:
- case Event::SaveAllStates:
- case Event::PreviousState :
- case Event::NextState:
- case Event::LoadState:
- case Event::LoadAllStates:
+ case Event::SaveState:
+ case Event::SaveAllStates:
+ case Event::PreviousState:
+ case Event::NextState:
+ case Event::LoadState:
+ case Event::LoadAllStates:
- case Event::ConsoleColor:
- case Event::ConsoleBlackWhite:
- case Event::ConsoleColorToggle:
- case Event::Console7800Pause:
- case Event::ConsoleLeftDiffA:
- case Event::ConsoleLeftDiffB:
- case Event::ConsoleLeftDiffToggle:
- case Event::ConsoleRightDiffA:
- case Event::ConsoleRightDiffB:
- case Event::ConsoleRightDiffToggle:
- if(!repeated)
- instance().eventHandler().handleEvent(event);
- return;
+ case Event::ConsoleColor:
+ case Event::ConsoleBlackWhite:
+ case Event::ConsoleColorToggle:
+ case Event::Console7800Pause:
+ case Event::ConsoleLeftDiffA:
+ case Event::ConsoleLeftDiffB:
+ case Event::ConsoleLeftDiffToggle:
+ case Event::ConsoleRightDiffA:
+ case Event::ConsoleRightDiffB:
+ case Event::ConsoleRightDiffToggle:
+ if(!repeated)
+ instance().eventHandler().handleEvent(event);
+ return;
- // events which need special handling in debugger
- case Event::TakeSnapshot:
- if(!repeated)
- instance().debugger().parser().run("saveSnap");
- return;
+ // events which need special handling in debugger
+ case Event::TakeSnapshot:
+ if(!repeated)
+ instance().debugger().parser().run("saveSnap");
+ return;
- case Event::Rewind1Menu:
- doRewind();
- return;
+ case Event::Rewind1Menu:
+ doRewind();
+ return;
- case Event::Rewind10Menu:
- doRewind10();
- return;
+ case Event::Rewind10Menu:
+ doRewind10();
+ return;
- case Event::RewindAllMenu:
- doRewindAll();
- return;
+ case Event::RewindAllMenu:
+ doRewindAll();
+ return;
- case Event::Unwind1Menu:
- doUnwind();
- return;
+ case Event::Unwind1Menu:
+ doUnwind();
+ return;
- case Event::Unwind10Menu:
- doUnwind10();
- return;
+ case Event::Unwind10Menu:
+ doUnwind10();
+ return;
- case Event::UnwindAllMenu:
- doUnwindAll();
- return;
+ case Event::UnwindAllMenu:
+ doUnwindAll();
+ return;
- default:
- break;
+ default:
+ break;
+ }
}
-
Dialog::handleKeyDown(key, mod);
}
diff --git a/src/os/windows/Stella.vcxproj b/src/os/windows/Stella.vcxproj
index 8e25f756f..26ce3db5e 100755
--- a/src/os/windows/Stella.vcxproj
+++ b/src/os/windows/Stella.vcxproj
@@ -797,7 +797,9 @@
true
-
+
+ true
+
true
@@ -831,7 +833,9 @@
true
-
+
+ true
+
true
@@ -868,7 +872,9 @@
true
-
+
+ true
+
true
@@ -911,14 +917,18 @@
true
-
+
+ true
+
true
true
-
+
+ true
+
true
@@ -949,7 +959,9 @@
true
-
+
+ true
+
true
@@ -977,7 +989,9 @@
true
-
+
+ true
+