From bf88bee58abe5856caae42eee2af36e1dcfd25d4 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Sun, 25 Mar 2012 19:39:10 +0000 Subject: [PATCH] fixed a crash that would occur when hugging the bottem edge of a menu with one option example: auto=choice sacrifice --- projects/mtg/src/SimpleMenu.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index 120c5e695..9dddbdc45 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -247,7 +247,14 @@ bool SimpleMenu::CheckUserInput(JButton key) if (y < menuTopEdge) n = (mCurr - 1) > 0 ? mCurr -1 : 0; else if (y >= menuBottomEdge) - n = (mCurr + 1) < mCount ? mCurr + 1 : mCurr - 1; + { + if(mCurr +1 < mCount) + n = mCurr + 1; + else if(mCurr - 1 > 0) + n = mCurr - 1; + else + n = 0; + } else { for (int i = 0; i < mCount; i++) @@ -259,7 +266,6 @@ bool SimpleMenu::CheckUserInput(JButton key) } } } - // check to see if the user clicked if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN)) {