From e237c1d07d4a257329ba4db1631f40054510d445 Mon Sep 17 00:00:00 2001 From: Jürgen Doser Date: Tue, 22 Jan 2013 17:03:38 +0100 Subject: Fix crash when no world is selected and configure button is pressed. by moving return statement out of if-then-else clause... --- src/guiMainMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 77a5a85b8..68ee990cd 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -1048,8 +1048,8 @@ bool GUIMainMenu::OnEvent(const SEvent& event) GUIConfigureWorld *menu = new GUIConfigureWorld(env, parent, -1, menumgr, wspec); menu->drop(); - return true; } + return true; } case GUI_ID_SERVERLIST_DELETE: { gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST); -- cgit v1.2.3 From f214940c96d9fef72b06a65641d01115a582b098 Mon Sep 17 00:00:00 2001 From: Jürgen Doser Date: Tue, 22 Jan 2013 16:55:50 +0100 Subject: Fix crash when pressing delete button in server browser and no server is selected. A check for that was there, but was comparing an unsigned variable to -1, which doesn't work. --- src/guiMainMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/guiMainMenu.cpp') diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp index 68ee990cd..9291bb4ec 100644 --- a/src/guiMainMenu.cpp +++ b/src/guiMainMenu.cpp @@ -1053,7 +1053,7 @@ bool GUIMainMenu::OnEvent(const SEvent& event) } case GUI_ID_SERVERLIST_DELETE: { gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST); - u16 selected = ((gui::IGUIListBox*)serverlist)->getSelected(); + s32 selected = ((gui::IGUIListBox*)serverlist)->getSelected(); if (selected == -1) return true; ServerList::deleteEntry(m_data->servers[selected]); m_data->servers = ServerList::getLocal(); -- cgit v1.2.3