From a8e9501dad01cafaeed268cfab44640c7050b8dc Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <m.bruker@digitalmedia.de>
Date: Mon, 7 Dec 2009 23:09:52 +0100
Subject: [PATCH] bug fix

---
 cockatrice/src/cardzone.cpp | 4 ++--
 cockatrice/src/player.cpp   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/cardzone.cpp b/cockatrice/src/cardzone.cpp
index 6abc84e6..de5af722 100644
--- a/cockatrice/src/cardzone.cpp
+++ b/cockatrice/src/cardzone.cpp
@@ -119,8 +119,8 @@ CardItem *CardZone::takeCard(int position, int cardId, const QString &cardName,
 			}
 		if (position == -1)
 			return 0;
-	}
-	Q_ASSERT(position < cards.size());
+	} else if (position >= cards.size())
+		return 0;
 
 	CardItem *c = cards.takeAt(position);
 
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index 4eb90c1f..7d7a6f09 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -242,6 +242,7 @@ Player::Player(const QString &_name, int _id, bool _local, Client *_client, TabG
 	} else {
 		countersMenu = 0;
 		sbMenu = 0;
+		cardMenu = 0;
 	}
 	
 	retranslateUi();