summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-19 15:01:42 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:25 +0300
commit3feb3ff102358390f11a032ac98870656cdd639a (patch)
treeb07d58cad8e5e30fbaf91fb1a7559107613dd7c2
parentff2f1d8b9a15aea5e3e6fd00eae8dc21ed7f0459 (diff)
downloadmanaplus-3feb3ff102358390f11a032ac98870656cdd639a.tar.gz
manaplus-3feb3ff102358390f11a032ac98870656cdd639a.tar.bz2
manaplus-3feb3ff102358390f11a032ac98870656cdd639a.tar.xz
manaplus-3feb3ff102358390f11a032ac98870656cdd639a.zip
move virtual member calls from worldselectdialog constructor into postInit.
-rw-r--r--src/client.cpp1
-rw-r--r--src/gui/windows/worldselectdialog.cpp4
-rw-r--r--src/gui/windows/worldselectdialog.h2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 222322f22..946c4481b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1309,6 +1309,7 @@ int Client::gameExec()
else
{
mCurrentDialog = new WorldSelectDialog(worlds);
+ mCurrentDialog->postInit();
if (mOptions.chooseDefault)
{
static_cast<WorldSelectDialog*>(mCurrentDialog)
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index 3d9581164..b3686ee10 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -120,6 +120,10 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds):
addKeyListener(this);
center();
+}
+
+void WorldSelectDialog::postInit()
+{
setVisible(true);
mChooseWorld->requestFocus();
}
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index d3107a807..6afaa25c8 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -52,6 +52,8 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
A_DELETE_COPY(WorldSelectDialog)
+ void postInit() override;
+
/**
* Destructor.
*/