From 5f2fbb370c085e7caa1bdbc3caf7fc39635292ba Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 11 Mar 2017 07:57:54 +0800
Subject: [PATCH] fix

---
 projects/mtg/bin/Res/sets/primitives/mtg.txt | 2 +-
 projects/mtg/src/MTGGameZones.cpp            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index b5b8f5431..89a8b1d46 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -38438,7 +38438,7 @@ toughness=3
 [card]
 name=Faerie Macabre
 abilities=flying
-autohand={S}:target(other *<upto:2>|graveyard) moveTo(exile)
+autohand={discard}:target(<upto:2>other *|graveyard) moveTo(exile)
 text=Flying -- Discard Faerie Macabre: Exile up to two target cards from graveyards.
 mana={1}{B}{B}
 type=Creature
diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp
index 70c9aea9b..15e774161 100644
--- a/projects/mtg/src/MTGGameZones.cpp
+++ b/projects/mtg/src/MTGGameZones.cpp
@@ -569,13 +569,13 @@ MTGGameZone::~MTGGameZone()
         //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;
+            cards[i]->previous = NULL;
         }
         if(cards[i])
         {
-            cards[i] = NULL;
             delete cards[i];
+            cards[i] = NULL;
         }
     }
     cards.clear();