diff options
| author | Simon Rettberg | 2016-10-20 00:09:03 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-10-20 00:09:03 +0200 |
| commit | 995a47062229e36873aa1e4e860565045d1fbb7e (patch) | |
| tree | f2d4f4569daa8ac8a1d7ca6cd695f6809ac964f4 /src/server/mainwindow/mainwindow.cpp | |
| parent | Implement "Attention" feature (virtual hand-raising) (diff) | |
| parent | [server] Remove pointless code relying on defunct tutor ip list (diff) | |
| download | pvs2-995a47062229e36873aa1e4e860565045d1fbb7e.tar.gz pvs2-995a47062229e36873aa1e4e860565045d1fbb7e.tar.xz pvs2-995a47062229e36873aa1e4e860565045d1fbb7e.zip | |
Merge branch 'master' of openslx.org:pvs2
Diffstat (limited to 'src/server/mainwindow/mainwindow.cpp')
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index ded64b9..c716849 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -1213,7 +1213,6 @@ void MainWindow::onClientAuthenticated(Client* client) disconnect(client, SIGNAL(authenticated(Client*)), this, SLOT(onClientAuthenticated(Client*))); connect(client, SIGNAL(vncServerStateChange(Client*)), this, SLOT(onVncServerStateChange(Client*))); connect(client, SIGNAL(vncClientStateChange(Client*)), this, SLOT(onVncClientStateChange(Client*))); - bool hasActiveTutor = false; ConnectionFrame *existing = NULL; for (QList<ConnectionFrame*>::iterator it(_clientFrames.begin()); it != _clientFrames.end(); ++it) { // qDebug() << "Existing frame ip: " << (*it)->computerId(); @@ -1222,27 +1221,11 @@ void MainWindow::onClientAuthenticated(Client* client) if ((*it)->computerId() == client->ip()) { existing = *it; } - if ((*it)->isTutor()) { - if ((*it)->client() != NULL) - hasActiveTutor = true; - } } - - bool isTutor = false; - if (!hasActiveTutor) { - for (int i = 0; i < _tutorList.size(); i++) { - // Check if client is possible tutor - if (client->ip() == _tutorList[i]) { - isTutor = true; - break; - } - } - } // Clients ip already exists, but was not active. if (existing != NULL) { // qDebug() << "Should go into this if clause."; - existing->setTutor(isTutor); existing->assignClient(client); tellClientCurrentSituation(client); updateExamMode(); @@ -1253,8 +1236,6 @@ void MainWindow::onClientAuthenticated(Client* client) ConnectionFrame *cf = createFrame(); // Move to any free tile placeFrameInFreeSlot(cf); - // Set Tutor option - cf->setTutor(isTutor); // Assign client instance cf->assignClient(client); |