diff options
author | Simon Rettberg | 2016-10-19 23:56:34 +0200 |
---|---|---|
committer | Simon Rettberg | 2016-10-19 23:56:34 +0200 |
commit | 6534027c5ce5579c4293aa346cadf0850aa02157 (patch) | |
tree | f9974a9dbed4ca33a4e167e05cde1dc7915b31a4 /src/server/mainwindow | |
parent | [client] Update translations (diff) | |
download | pvs2-6534027c5ce5579c4293aa346cadf0850aa02157.tar.gz pvs2-6534027c5ce5579c4293aa346cadf0850aa02157.tar.xz pvs2-6534027c5ce5579c4293aa346cadf0850aa02157.zip |
Implement "Attention" feature (virtual hand-raising)
Diffstat (limited to 'src/server/mainwindow')
-rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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<ConnectionFrame*>::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(); } } |