Minor last touches

monkeyman79 · Feb 1, 2021 · c79db73 · c79db73
1 parent caf3afa
commit c79db73
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Src/beebwin.cpp b/Src/beebwin.cpp
@@ -1464,7 +1464,9 @@ void BeebWin::ResetJoystick(void)
 	//			m_Joystick2Captured = false;
 	//	}
 	//}
-	AtoDDisable();
+
+	// Don't disable AtoD here, we may want to reset joystick, but keep
+	// mousestick active
 }
 
 /****************************************************************************/
@@ -3470,10 +3472,7 @@ void BeebWin::HandleCommand(int MenuId)
 			{
 				ResetJoystick();
 			}
-			else /* mousestick */
-			{
-				AtoDDisable();
-			}
+			AtoDDisable();
 		}
 
 		if (MenuId == m_MenuIdSticks)
@@ -4319,7 +4318,9 @@ void BeebWin::UserKeyboardDialogClosed()
 	{
 		m_JoystickToKeys = m_J2KWasEnabled;
 		if (m_MenuIdSticks != IDM_JOYSTICK)
+		{
 			ResetJoystick();
+		}
 	}
 }