From d5f268ba03a9d14abbbd16dc44681ed1a8cbb755 Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew" Date: Sun, 30 Nov 2008 01:06:37 +0000 Subject: [PATCH] Erwan - fixed SimpleMenu Heap corruption in main menu --- projects/mtg/include/GameStateMenu.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/mtg/include/GameStateMenu.h b/projects/mtg/include/GameStateMenu.h index d32a25a54..8bce9f280 100644 --- a/projects/mtg/include/GameStateMenu.h +++ b/projects/mtg/include/GameStateMenu.h @@ -262,8 +262,10 @@ subMenuController = NULL; if (mEngine->GetButtonClick(PSP_CTRL_CIRCLE)) currentState = STATE_MENU; } }else{ - if (currentState == STATE_MENU && mGuiController!=NULL) - mGuiController->Update(dt); + if (currentState == STATE_MENU && mGuiController!=NULL){ + mGuiController->Update(dt); + SAFE_DELETE(subMenuController); + } if (currentState == STATE_SUBMENU){ if( subMenuController){ subMenuController->Update(dt); @@ -351,7 +353,7 @@ subMenuController = NULL; mCollection->addRandomCards(11, setId,RARITY_C); } mCollection->save(); - delete mCollection; + SAFE_DELETE(mCollection); } virtual void Render() @@ -425,7 +427,6 @@ subMenuController = NULL; case 101: createUsersFirstDeck(controlId); currentState = STATE_MENU; - SAFE_DELETE(subMenuController); break; default: switch (controlId) @@ -462,7 +463,6 @@ subMenuController = NULL; break; case 14: currentState = STATE_MENU; - SAFE_DELETE(subMenuController); break; #ifdef TESTSUITE case 666: