From e3863d47de8ced079ddfee3805c338cbed731192 Mon Sep 17 00:00:00 2001
From: ThorstenB <51717934+ThorstenBr@users.noreply.github.com>
Date: Mon, 20 Feb 2023 20:57:25 +0100
Subject: [PATCH] Properly catch the use of multiple Z80 cards. (PR #1184)

---
 source/CardManager.cpp | 5 ++++-
 source/CardManager.h   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/CardManager.cpp b/source/CardManager.cpp
index da05c99d..27533791 100644
--- a/source/CardManager.cpp
+++ b/source/CardManager.cpp
@@ -87,7 +87,7 @@ void CardManager::InsertInternal(UINT slot, SS_CARDTYPE type)
 	case CT_Z80:
 		_ASSERT(m_pZ80Card == NULL);
 		if (m_pZ80Card) break;	// Only support one Z80 card
-		m_slot[slot] = new Z80Card(slot);
+		m_slot[slot] = m_pZ80Card = new Z80Card(slot);
 		break;
 	case CT_Phasor:
 		m_slot[slot] = new MockingboardCard(slot, type);
@@ -167,6 +167,9 @@ void CardManager::RemoveInternal(UINT slot)
 		case CT_LanguageCardIIe:
 			m_pLanguageCard = NULL;
 			break;
+		case CT_Z80:
+			m_pZ80Card = NULL;
+			break;
 		}
 
 		UnregisterIoHandler(slot);
diff --git a/source/CardManager.h b/source/CardManager.h
index c4b7852c..1c24354b 100644
--- a/source/CardManager.h
+++ b/source/CardManager.h
@@ -83,5 +83,5 @@ private:
 	class CSuperSerialCard* m_pSSC;
 	class LanguageCardUnit* m_pLanguageCard;
 	class ParallelPrinterCard* m_pParallelPrinterCard;
-	class m_pZ80Card* m_pZ80Card;
+	class Z80Card* m_pZ80Card;
 };