From 8507c0138d13897e94512cd2874780d1d1cd23ca Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 26 Jan 2017 21:02:12 +0800 Subject: [PATCH] crash fix when loading collection and shop --- projects/mtg/src/CardGui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 2859f7afc..08bb48643 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -1149,7 +1149,7 @@ void CardGui::RenderBig(MTGCard* card, const Pos& pos, bool thumb, bool noborder MTGCard * fcard = MTGCollection()->getCardByName(kcard->name); quad = WResourceManager::Instance()->RetrieveCard(fcard); } - if (kcard->getObserver() && kcard->hasCopiedToken && !quad.get()) + if (kcard && kcard->hasCopiedToken) { MTGCard * tcard = MTGCollection()->getCardById(abs(kcard->copiedID)); quad = thumb ? WResourceManager::Instance()->RetrieveCardToken(tcard, RETRIEVE_THUMB, 1, abs(kcard->copiedID))