Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 15:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix for II(orig) model change, and slot 0 saying 'Unknown card added'

Browse Source
This commit is contained in:
tomcw
2026-01-04 16:25:18 +00:00
parent 195790ace4
commit ecb68ca1d4
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Configuration/PageSound.cpp
+2 -2
View File
@@ -197,8 +197,8 @@ INT_PTR CPageSound::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPAR
{
DialogBox(GetFrame().g_hInstance, (LPCTSTR)IDD_RAMWORKS3, hWnd, CPageSound::DlgProcRamWorks3);
}
break;
}
break;
case IDC_SLOT_DEFAULT_CARDS:
{
@@ -209,8 +209,8 @@ INT_PTR CPageSound::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPAR
m_PropertySheetHelper.GetConfigNew().m_SlotAux = GetCardMgr().QueryDefaultCardForSlot(SLOT_AUX, m_PropertySheetHelper.GetConfigNew().m_Apple2Type);
InitOptions(hWnd);
break;
}
break;
}
break;
source/Configuration/PropertySheetHelper.cpp
+28 -14
View File
@@ -613,23 +613,37 @@ std::string CPropertySheetHelper::GetSlot(const UINT slot)
return "Error: Illegal Slot!";
}
if (oldCardType == CT_Empty || newCardType == CT_Empty)
{
if (newCardType == CT_Empty)
{
strMsg += Card::GetCardName(oldCardType);
strMsg += " card removed\n";
}
else
{
strMsg += Card::GetCardName(newCardType);
strMsg += " card added\n";
}
}
else if (oldCardType == CT_LanguageCardIIe || newCardType == CT_LanguageCardIIe)
if (oldCardType == CT_LanguageCardIIe || newCardType == CT_LanguageCardIIe)
{
// Switch model: II/II+ (slot 0) <-> //e (no slot 0)
if (newCardType == CT_LanguageCardIIe)
{
if (oldCardType != CT_Empty)
{
strMsg += Card::GetCardName(oldCardType);
strMsg += " card removed\n";
}
else
{
strMsg = "";
}
}
else
{
if (newCardType != CT_Empty)
{
strMsg += Card::GetCardName(newCardType);
strMsg += " card added\n";
}
else
{
strMsg = "";
}
}
}
else if (oldCardType == CT_Empty || newCardType == CT_Empty)
{
if (newCardType == CT_Empty)
{
strMsg += Card::GetCardName(oldCardType);
strMsg += " card removed\n";