Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

This commit is contained in:
Max-Wilhelm Bruker 2010-12-15 20:16:01 +01:00
commit f94fac80c1

View file

@ -807,9 +807,12 @@ void Player::eventMoveCard(Event_MoveCard *event)
return;
card->setName(event->getCardName());
if (card->getAttachedTo() && (startZone != targetZone))
if (card->getAttachedTo() && (startZone != targetZone)) {
CardItem *parentCard = card->getAttachedTo();
card->setAttachedTo(0);
parentCard->getZone()->reorganizeCards();
}
card->deleteDragItem();
card->setId(event->getNewCardId());