From a57f2b29a3597befcd0162b866212a0ab6caadbe Mon Sep 17 00:00:00 2001 From: tomcw Date: Thu, 6 Oct 2022 21:13:05 +0100 Subject: [PATCH] Support '-s6 diskii' and '-s6 diskii13' (#1133) . so that a diskii card can be re-inserted into an empty slot 6 Improve command line for slots 5&6: -sN diskii and -sN diskii13 . on a restart (or change of config), if that diskii card is already in the slot then ignore . ie. don't lose the image(s) across a restart --- source/Windows/AppleWin.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/Windows/AppleWin.cpp b/source/Windows/AppleWin.cpp index e00a360a..eacbff03 100644 --- a/source/Windows/AppleWin.cpp +++ b/source/Windows/AppleWin.cpp @@ -786,7 +786,14 @@ static void RepeatInitialization(void) GetCardMgr().Remove(SLOT5); } - GetCardMgr().Insert(SLOT5, g_cmdLine.slotInsert[SLOT5]); + if (GetCardMgr().QuerySlot(SLOT5) != CT_Disk2) // Ignore if already got Disk2 in slot 5 + GetCardMgr().Insert(SLOT5, g_cmdLine.slotInsert[SLOT5]); + } + + if (g_cmdLine.slotInsert[SLOT6] == CT_Disk2) // For now just support Disk2 in slot 6 + { + if (GetCardMgr().QuerySlot(SLOT6) != CT_Disk2) // Ignore if already got Disk2 in slot 6 + GetCardMgr().Insert(SLOT6, g_cmdLine.slotInsert[SLOT6]); } for (UINT i = 0; i < NUM_SLOTS; i++)