Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverting change made in r2701

Browse Source 
The conditions on which to "updateStats" during the rebuilding of filters needed to be updated.  stw is NULL
when rebuilding the filters due to a "UNLOCK CARDS" action.  Thus the call to stw->updateStats throws a NPE.
stw is not null only when a deck has been selected to edit.  Otherwise, it makes no sense to actually update the
stats of a non-selected deck.
This commit is contained in:
techdragon.nguyen@gmail.com
2010-11-29 11:50:12 +00:00
parent 0856ddaeb2
commit b46112dfcd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/mtg/src/DeckStats.cpp
View File

@@ -260,12 +260,9 @@ void StatsWrapper::updateStats(string filename, MTGAllCards *collection)
void StatsWrapper::updateStats(DeckDataWrapper *myDeck) void StatsWrapper::updateStats(DeckDataWrapper *myDeck)
{ {
if (!myDeck) if (!this->needUpdate || !myDeck) return;
{
return; this->needUpdate = false;
}
if (!this->needUpdate) return;
this->needUpdate = false;
this->cardCount = myDeck->getCount(WSrcDeck::UNFILTERED_COPIES); this->cardCount = myDeck->getCount(WSrcDeck::UNFILTERED_COPIES);
this->countLands = myDeck->getCount(Constants::MTG_COLOR_LAND); this->countLands = myDeck->getCount(Constants::MTG_COLOR_LAND);
this->totalPrice = myDeck->totalPrice(); this->totalPrice = myDeck->totalPrice();

5
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -101,7 +101,10 @@ void GameStateDeckViewer::rebuildFilters()
filterMenu->setSrc(source); filterMenu->setSrc(source);
if (displayed_deck != myDeck) source->swapSrc(); if (displayed_deck != myDeck) source->swapSrc();
filterMenu->Finish(true); filterMenu->Finish(true);
stw->updateStats( myDeck );;
// no stats need updating if there isn't a deck to update
if (stw && myDeck)
stw->updateStats( myDeck );;
} }
void GameStateDeckViewer::updateFilters() void GameStateDeckViewer::updateFilters()
{ {