New Feature: Showing client toolbar while vnc server is running.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index 34dafd5..8e80fe3 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -25,6 +25,7 @@ Toolbar::Toolbar(QWidget *parent) :
 	_connectWindow = new ConnectWindow(NULL);
 	connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect()));
 	connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*)));
+    connect(VncServer::instance(), SIGNAL(started(int, QString&, QString&)), this, SLOT(onVncServerIsRunning(int, QString&, QString&)));
 	//
 	setupMenu();
 	setLocation();
@@ -110,7 +111,8 @@ void Toolbar::setBarVisible(bool shown)
 
 bool Toolbar::hideBar()
 {
-	if (_menu->isVisible()) // Don't hide window if any menu is open
+    // Don't hide window if any menu is open or VNC Server is running from this client.
+    if (_menu->isVisible() || VncServer::instance()->isVncServerRunning())
 		return false;
 	setBarVisible(false);
 	return true;
@@ -158,6 +160,17 @@ void Toolbar::timerEvent(QTimerEvent* event)
  * Slots
  */
 
+void Toolbar::onVncServerIsRunning(int port, QString&, QString&)
+{
+    if (port > 0)
+    {
+        setBarVisible(true);
+        return;
+    }
+    hideBar();
+    return;
+}
+
 void Toolbar::onDisconnected()
 {
 	_connectWindow->setConnected(false);