diff options
| author | Björn Hagemeister | 2014-06-02 15:27:23 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-06-02 15:27:23 +0200 |
| commit | 4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62 (patch) | |
| tree | c798ea39460f49f6f6e34f7f909470923bf68e5f /src/client/toolbar | |
| parent | Put Check if manager is running on machine into method. (diff) | |
| parent | Uncheck lock if any action is performed. (diff) | |
| download | pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.tar.gz pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.tar.xz pvs2-4778d18cc1287e9a3fd2c3a7eec5f90e685c3f62.zip | |
Merge branch 'master' of git.openslx.org:pvs2
Conflicts:
src/server/mainwindow/mainwindow.h
Diffstat (limited to 'src/client/toolbar')
| -rw-r--r-- | src/client/toolbar/toolbar.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp index 88d4b2a..9bc5998 100644 --- a/src/client/toolbar/toolbar.cpp +++ b/src/client/toolbar/toolbar.cpp @@ -174,8 +174,7 @@ void Toolbar::onVncServerIsRunning(int port) */ void Toolbar::onDisconnected() { - _connectWindow->setConnected(false); - if (_connection != NULL) + if (_connection != NULL) _connection->blockSignals(true); _connection = NULL; _ui->lblStatus->setStyleSheet("color:red"); @@ -205,7 +204,6 @@ void Toolbar::onConnected(ServerConnection* connection) _vnc, SLOT(open(const QString&, int, const QString&, bool, bool, const QString&, const int))); connect(_connection, SIGNAL(closeVnc()), _vnc, SLOT(close())); connect(_vnc, SIGNAL(running(const bool, const int)), _connection, SLOT(onVncViewerStartStop(const bool, const int))); - _connectWindow->setConnected(true); } /***************************************************************************//** |