bug fix

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);
 

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();