From 42020947105bde8543f4a2b5f87a6bd5b575cb50 Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Fri, 13 May 2016 10:05:55 +0200
Subject: connect/disconnect events are working (again).

---
 src/client/toolbar/toolbar.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/client/toolbar/toolbar.cpp')

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 4c74a4a..f938494 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -122,6 +122,7 @@ void Toolbar::init()
 	// Connect the signals
 	connect(_menu, SIGNAL(aboutToHide()), this, SLOT(hideBar()));
 	connect(_acnConnect, SIGNAL(triggered()), _connectWindow, SLOT(doShow()));
+    connect(_acnDisconnect, SIGNAL(triggered()), _connectWindow, SLOT(DoDisconnect()));
 	connect(_acnAbout, SIGNAL(triggered()), this, SLOT(showAboutDialog()));
 	connect(_acnQuit, SIGNAL(triggered()), this, SLOT(exit()));
 
@@ -302,13 +303,15 @@ void Toolbar::onVncServerIsRunning(int port)
  * A slot for the onDisconnected signal of the ConnectWindow. This slot will
  * change the UI according to the state fo the connection.
  */
-void Toolbar::onDisconnected()
-{
+void Toolbar::onDisconnected() {
 	if (_connection != NULL)
 		_connection->blockSignals(true);
 	_connection = NULL;
 	_ui->lblStatus->setStyleSheet("color:red");
 	_ui->lblStatus->setText(tr("Offline"));
+
+    this->_acnConnect->setEnabled(true);
+    this->_acnDisconnect->setEnabled(false);
 }
 
 /***************************************************************************//**
@@ -319,8 +322,10 @@ void Toolbar::onDisconnected()
  */
 void Toolbar::onConnected(ServerConnection* connection)
 {
-
     this->_acnConnect->setEnabled(false);
+    this->_acnDisconnect->setEnabled(true);
+
+
 	_ui->lblStatus->setStyleSheet("color:green");
 	_ui->lblStatus->setText(tr("Online"));
 	//
@@ -345,9 +350,6 @@ void Toolbar::onDoDisconnect()
 {
 	if (_connection != NULL)
 		_connection->disconnectFromServer();
-
-    this->_acnConnect->setEnabled(true);
-    this->_acnDisconnect->setEnabled(false);
 }
 
 /***************************************************************************//**
-- 
cgit v1.2.3-55-g7522