diff options
| author | Simon Rettberg | 2015-02-02 17:56:57 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-02-02 17:56:57 +0100 |
| commit | 4b58d3b01b62809ccc303027a44ea0360b2cc249 (patch) | |
| tree | 3ed448ac6525c2bbaac3438b5f58593450aecd97 /src/client/connectwindow/connectwindow.cpp | |
| parent | Try to bring connect window to top more agressively; require c++0x instead of... (diff) | |
| download | pvs2-4b58d3b01b62809ccc303027a44ea0360b2cc249.tar.gz pvs2-4b58d3b01b62809ccc303027a44ea0360b2cc249.tar.xz pvs2-4b58d3b01b62809ccc303027a44ea0360b2cc249.zip | |
Restore window state when opening connect window. Reconnect to session when using --auto
Diffstat (limited to 'src/client/connectwindow/connectwindow.cpp')
| -rw-r--r-- | src/client/connectwindow/connectwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp index 8631b43..be4e7fd 100644 --- a/src/client/connectwindow/connectwindow.cpp +++ b/src/client/connectwindow/connectwindow.cpp @@ -145,6 +145,7 @@ void ConnectWindow::closeEvent(QCloseEvent *e) void ConnectWindow::doShow() { show(); + showNormal(); activateWindow(); raise(); } @@ -170,8 +171,11 @@ void ConnectWindow::connectToSession(const QByteArray sessionName, QString mgrIP { if (_state != Idle) return; + _currentSession = sessionName; + _currentIp = mgrIP; _state = Scanning; this->updateUserInterface(); + _tryReconnect = true; _serverDiscovery.start(sessionName, mgrIP); } @@ -206,7 +210,6 @@ void ConnectWindow::onBtnConnection() else { // Connect (scan for session) - _tryReconnect = true; // qDebug() << _ui->lineEditName->text().toUtf8(); connectToSession(_ui->lineEditName->text().toUtf8(), NULL); } |