From 4d0296d62832068ca03ef374f84392cc431b389a Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Sun, 12 Dec 2010 09:44:45 +0000 Subject: [PATCH] Fixed issue 551, "this vector contains over 1 million members" crash. Thanks to Mike for helping me with the repro & debug session on his machine. --- projects/mtg/src/GuiCombat.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp index 9f37ff675..eada16c0b 100644 --- a/projects/mtg/src/GuiCombat.cpp +++ b/projects/mtg/src/GuiCombat.cpp @@ -580,7 +580,7 @@ int GuiCombat::receiveEventMinus(WEvent* e) (*it)->show = (1 < (*it)->blockers.size()); autoaffectDamage(*it, DAMAGE); } - active = NULL; + active = activeAtk = NULL; for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it) if ((*it)->show) { @@ -633,7 +633,7 @@ int GuiCombat::receiveEventMinus(WEvent* e) == step))) && (((*it)->card->has(Constants::TRAMPLE) ? (size_t) 0 : (size_t) 1) < (*it)->blockers.size()); repos (attackers.begin(), attackers.end(), 0); - active = NULL; + active = activeAtk = NULL; for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it) if ((*it)->show) {