From 64784b2dc81d6e2fd280cf070d7dff394d75a4c5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 29 Sep 2010 00:54:14 +0000 Subject: [PATCH] - fixed: DOptionMenu::FirstSelectable should not be called when the menu already has a valid selection. SVN r2863 (trunk) --- src/menu/optionmenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/menu/optionmenu.cpp b/src/menu/optionmenu.cpp index 5c45d0efb..12294a36c 100644 --- a/src/menu/optionmenu.cpp +++ b/src/menu/optionmenu.cpp @@ -96,7 +96,7 @@ void DOptionMenu::Init(DMenu *parent, FOptionMenuDescriptor *desc) mParentMenu = parent; GC::WriteBarrier(this, parent); mDesc = desc; - if (mDesc != NULL) mDesc->mSelectedItem = FirstSelectable(); + if (mDesc != NULL && mDesc->mSelectedItem == -1) mDesc->mSelectedItem = FirstSelectable(); } @@ -108,7 +108,7 @@ void DOptionMenu::Init(DMenu *parent, FOptionMenuDescriptor *desc) int DOptionMenu::FirstSelectable() { - if (mDesc != NULL && mDesc->mSelectedItem < 0) + if (mDesc != NULL) { // Go down to the first selectable item int i = -1;