diff options
| author | Björn Hagemeister | 2014-07-30 16:18:47 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-07-30 16:18:47 +0200 |
| commit | f3b457144940f39c0977f68c6ce546de01d0ca76 (patch) | |
| tree | d095c58efac841894fdf34be5144912e5c5472b8 | |
| parent | Added user warning before second or more change of sessionName. (diff) | |
| download | pvs2-f3b457144940f39c0977f68c6ce546de01d0ca76.tar.gz pvs2-f3b457144940f39c0977f68c6ce546de01d0ca76.tar.xz pvs2-f3b457144940f39c0977f68c6ce546de01d0ca76.zip | |
Fixed unintended bug from yesterday.
| -rw-r--r-- | src/client/net/serverconnection.cpp | 2 | ||||
| -rw-r--r-- | src/server/mainwindow/mainwindow.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp index babd64f..7954c34 100644 --- a/src/client/net/serverconnection.cpp +++ b/src/client/net/serverconnection.cpp @@ -26,7 +26,7 @@ ServerConnection::ServerConnection(const QString& host, const quint16 port, cons connect(_socket, SIGNAL(encrypted()), this, SLOT(sock_connected())); connect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); connect(_socket, SIGNAL(disconnected()), this, SLOT(sock_closed())); - connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError))); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError))); connect(_socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 51da124..49ffc00 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -212,7 +212,7 @@ ConnectionFrame* MainWindow::createFrame() _clientFrames.append(cf); cf->show(); connect(cf, SIGNAL(frameMoved(bool, ConnectionFrame *)), this, SLOT(onPlaceFrame(bool, ConnectionFrame *))); - connect(cf, SIGNAL(clicked(bool, ConnectionFrame *)), this, SLOT(onFrameClicked(ConnectionFrame *))); + connect(cf, SIGNAL(clicked(ConnectionFrame *)), this, SLOT(onFrameClicked(ConnectionFrame *))); return cf; } @@ -1015,6 +1015,7 @@ void MainWindow::onClientAuthenticated(Client* client) // 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); |