diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-19 13:37:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-19 15:12:25 +0300 |
| commit | 9e7105682e11210df656346bf42c66b2d3e6b60e (patch) | |
| tree | 5216296d2dab26e00d1149aea6bf0d4ac59d5d0f | |
| parent | b54549e4635fcbea922d42f2d5454b0f84ebe383 (diff) | |
| download | mv-9e7105682e11210df656346bf42c66b2d3e6b60e.tar.gz mv-9e7105682e11210df656346bf42c66b2d3e6b60e.tar.bz2 mv-9e7105682e11210df656346bf42c66b2d3e6b60e.tar.xz mv-9e7105682e11210df656346bf42c66b2d3e6b60e.zip | |
move virtual member calls from updaterwindow constructor into postInit.
| -rw-r--r-- | src/client.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp index 59ce01f75..222322f22 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1362,6 +1362,7 @@ int Client::gameExec() mOldUpdates, mOptions.dataPath.empty(), loginData.updateType); + mCurrentDialog->postInit(); } BLOCK_END("Client::gameExec STATE_UPDATE") break; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 10b887132..37b392b43 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -213,6 +213,10 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost, addKeyListener(this); loadWindowState(); +} + +void UpdaterWindow::postInit() +{ setVisible(true); mCancelButton->requestFocus(); removeProtocol(mUpdateServerPath); diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index b96616cbc..fca58b3f8 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -92,6 +92,8 @@ class UpdaterWindow final : public Window, */ ~UpdaterWindow(); + void postInit() override; + /** * Set's progress bar status */ |