From 74e429575a1ace40339e3a7c73250548aec85247 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 18 Oct 2013 21:26:49 +0300 Subject: move virtual member calls from serverdialog constuctor into postInit. --- src/client.cpp | 1 + src/gui/windows/serverdialog.cpp | 3 +++ src/gui/windows/serverdialog.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/client.cpp b/src/client.cpp index 33b0ffbb0..4a22836c9 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1217,6 +1217,7 @@ int Client::gameExec() mCurrentDialog = new ServerDialog(&mCurrentServer, mConfigDir); + mCurrentDialog->postInit(); } else { diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index d1ec6f0df..a8895cad9 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -330,7 +330,10 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo, addKeyListener(this); loadWindowState(); +} +void ServerDialog::postInit() +{ setVisible(true); mConnectButton->requestFocus(); diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index 95bcda706..31ad9609a 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -104,6 +104,8 @@ class ServerDialog final : public Window, A_DELETE_COPY(ServerDialog) + void postInit() override; + /** * Destructor */ -- cgit v1.2.3-60-g2f50