From 6534027c5ce5579c4293aa346cadf0850aa02157 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 19 Oct 2016 23:56:34 +0200 Subject: Implement "Attention" feature (virtual hand-raising) --- src/server/mainwindow/mainwindow.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/server/mainwindow/mainwindow.cpp') diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index b54a190..ded64b9 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -689,8 +689,10 @@ void MainWindow::reset() // Unlock all clients for (QList::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) - if ((*it)->client() != NULL) + if ((*it)->client() != NULL) { (*it)->client()->lockScreen(false); + (*it)->client()->removeAttention(); + } // Stop server (Clients get stopped on ACK) if (getClientFromId(_streamingSource) != NULL) @@ -791,10 +793,12 @@ void MainWindow::startVncServerIfNecessary(int from) // If streaming source is already active avoid a restart if (ns != NULL) { - if (ns->isActiveVncServer()) + if (ns->isActiveVncServer()) { this->onVncServerStateChange(ns); - else // Could not take shortcut, (re)start VNC server on source + } else { // Could not take shortcut, (re)start VNC server on source ns->startVncServer(); + } + ns->removeAttention(); } } -- cgit v1.2.3-55-g7522