From 800d3b4ee7dfe527d8540c9e2464117dc24ad1d0 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 13 Mar 2012 00:58:57 +0200 Subject: [PATCH] Fix game selection in world creation (used always the first one) --- src/guiCreateWorld.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/guiCreateWorld.cpp b/src/guiCreateWorld.cpp index 7143f955..159e736c 100644 --- a/src/guiCreateWorld.cpp +++ b/src/guiCreateWorld.cpp @@ -184,11 +184,20 @@ void GUICreateWorld::acceptInput() { if(m_dest) { - gui::IGUIElement *e = getElementFromId(GUI_ID_NAME_INPUT); - if(e != NULL) + int selected = -1; { - m_dest->accepted(e->getText(), m_games[0].id); + gui::IGUIElement *e = getElementFromId(GUI_ID_GAME_LISTBOX); + if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX) + selected = ((gui::IGUIListBox*)e)->getSelected(); } + std::wstring name; + { + gui::IGUIElement *e = getElementFromId(GUI_ID_NAME_INPUT); + if(e != NULL) + name = e->getText(); + } + if(selected != -1 && name != L"") + m_dest->accepted(name, m_games[selected].id); delete m_dest; m_dest = NULL; }