From d0c6dede6cb4b21b4d935a75d852e41b3bcc64b9 Mon Sep 17 00:00:00 2001 From: sr Date: Tue, 5 Feb 2013 17:51:20 +0100 Subject: [SERVER] fix vnc startup command --- src/server/mainwindow/mainwindow.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/server/mainwindow/mainwindow.cpp') diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 48a1a57..67d88d0 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -357,17 +357,22 @@ void MainWindow::prepareForProjection(Client * const from, Client * const to) { // Projection source is never allowed to be an active VNC viewer if (from->isActiveVncClient()) + { + qDebug("From is active client, stopping..."); from->stopVncClient(); + } if (to == NULL) { // One to many + qDebug("One to many requested..."); from->setProjectionSource(true); if (from->isActiveVncServer()) { // From is already active, if there is at least one active client, assume it is not // shutting down, so we can directly tell the new client to connect to it + qDebug("Source is already running a VNC server...."); for (QList::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) { Client *c = (**it).client(); @@ -376,11 +381,14 @@ void MainWindow::prepareForProjection(Client * const from, Client * const to) if (c->currentProjectionSource() != from->id()) continue; // Yep :-) + qDebug("Reusing because of active client"); this->onVncServerStateChange(from); return; } + qDebug("But no active client found...."); } // Could not take shortcut, (re)start VNC server on source + qDebug("Starting VNC server on source machine"); from->startVncServer(); return; } -- cgit v1.2.3-55-g7522