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

Jeck - Fixed an issue which caused deck switching to crash.

Browse Source
This commit is contained in:
wagic.jeck
2010-03-01 07:27:10 +00:00
parent 96f021ac2d
commit 855288fa87
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateDeckViewer.cpp
+3 -2
View File
@@ -68,7 +68,8 @@ void GameStateDeckViewer::rotateCards(int direction){
} }
void GameStateDeckViewer::rebuildFilters(){ void GameStateDeckViewer::rebuildFilters(){
if(!filterMenu) filterMenu = NEW WGuiFilters("Filter by...",NULL); if(!filterMenu) filterMenu = NEW WGuiFilters("Filter by...",NULL);
if(!source) source = NEW WSrcDeckViewer(myDeck,myCollection); if(source) SAFE_DELETE(source);
source = NEW WSrcDeckViewer(myDeck,myCollection);
filterMenu->setSrc(source); filterMenu->setSrc(source);
if(displayed_deck != myDeck) source->swapSrc(); if(displayed_deck != myDeck) source->swapSrc();
filterMenu->Finish(true); filterMenu->Finish(true);
@@ -103,7 +104,6 @@ void GameStateDeckViewer::switchDisplay(){
void GameStateDeckViewer::updateDecks(){ void GameStateDeckViewer::updateDecks(){
SAFE_DELETE(welcome_menu); SAFE_DELETE(welcome_menu);
welcome_menu = NEW SimpleMenu(10,this,Constants::MENU_FONT,20,20); welcome_menu = NEW SimpleMenu(10,this,Constants::MENU_FONT,20,20);
nbDecks = fillDeckMenu(welcome_menu,options.profileFile()); nbDecks = fillDeckMenu(welcome_menu,options.profileFile());
@@ -328,6 +328,7 @@ void GameStateDeckViewer::Update(float dt)
mStage = STAGE_FILTERS; mStage = STAGE_FILTERS;
if(!filterMenu){ if(!filterMenu){
filterMenu = NEW WGuiFilters("Filter by...",NULL); filterMenu = NEW WGuiFilters("Filter by...",NULL);
if(source) SAFE_DELETE(source);
source = NEW WSrcDeckViewer(myDeck,myCollection); source = NEW WSrcDeckViewer(myDeck,myCollection);
filterMenu->setSrc(source); filterMenu->setSrc(source);
if(displayed_deck != myDeck) source->swapSrc(); if(displayed_deck != myDeck) source->swapSrc();