diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index afcd38789..c5ac0cd29 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -191,7 +191,13 @@ void CardItem::setAttachedTo(CardItem *_attachedTo) attachedTo->getZone()->reorganizeCards(); } } else { - emit zone->cardAdded(this); + // If the zone is being torn down, it might already be null by the time a card tries to re-attach all its + // attached cards + if (zone == nullptr) { + deleteLater(); + } else { + emit zone->cardAdded(this); + } } if (zone != nullptr) {