From 4b58d3b01b62809ccc303027a44ea0360b2cc249 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 2 Feb 2015 17:56:57 +0100 Subject: Restore window state when opening connect window. Reconnect to session when using --auto --- src/client/connectwindow/connectwindow.cpp | 5 ++++- src/client/connectwindow/connectwindow.h | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/client/connectwindow') 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); } diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h index 7cf52c3..bc8a4ba 100644 --- a/src/client/connectwindow/connectwindow.h +++ b/src/client/connectwindow/connectwindow.h @@ -62,7 +62,8 @@ private: int _hashSslErrorCount; ServerDiscovery _serverDiscovery; ConnectionState _state; - QByteArray _sessionNameBytes; + QByteArray _currentSession; + QString _currentIp; NetworkMessage _packet; bool _tryReconnect; int _timerHide; -- cgit v1.2.3-55-g7522