From 1c60ba6e7fb55bbef5bb541f602d4f25cafefd6b Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 20 Feb 2017 22:06:56 +0800 Subject: [PATCH] crash fix when you generate a castcard, then exit the game, an exception occurs to SAFE_DELETE(cards[i]->previous) && SAFE_DELETE(cards[i]) in mtggamezones.cpp line 548 and 549. --- projects/mtg/src/MTGGameZones.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 165516841..277f92371 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -545,8 +545,19 @@ MTGGameZone::~MTGGameZone() for (size_t i = 0; i < cards.size(); i++) { cards[i]->stillNeeded = false; - SAFE_DELETE(cards[i]->previous); - SAFE_DELETE( cards[i] ); + //SAFE_DELETE(cards[i]->previous); + //SAFE_DELETE( cards[i] ); + //cause crashes for generated cards using castcard named card...??? test fix for now + if(cards[i]->previous) + { + cards[i]->previous = NULL; + delete cards[i]->previous; + } + if(cards[i]) + { + cards[i] = NULL; + delete cards[i]; + } } cards.clear(); cardsMap.clear();