summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/net/serverconnection.cpp1
-rw-r--r--src/client/util/platform/blankscreen.h2
-rw-r--r--src/server/net/sslserver.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp
index 46f2538..826cf06 100644
--- a/src/client/net/serverconnection.cpp
+++ b/src/client/net/serverconnection.cpp
@@ -44,6 +44,7 @@ ServerConnection::ServerConnection(const QString& host, const quint16 port, cons
ServerConnection::~ServerConnection()
{
+ this->disconnectFromServer();
if (_socket != NULL) {
qCritical("**** SOCKET DELETE IN DESTRUCTOR");
_socket->deleteLater();
diff --git a/src/client/util/platform/blankscreen.h b/src/client/util/platform/blankscreen.h
index 35cf297..24c4969 100644
--- a/src/client/util/platform/blankscreen.h
+++ b/src/client/util/platform/blankscreen.h
@@ -5,7 +5,7 @@
#include <QDialog>
#include <QDebug>
-class BlankScreen_Sysdep;
+struct BlankScreen_Sysdep;
class BlankScreen : public QDialog
{
diff --git a/src/server/net/sslserver.h b/src/server/net/sslserver.h
index 0b3120e..7b727aa 100644
--- a/src/server/net/sslserver.h
+++ b/src/server/net/sslserver.h
@@ -37,7 +37,7 @@ public:
SslServer();
virtual ~SslServer();
- bool hasPendingConnections ();
+ virtual bool hasPendingConnections () const;
// This one has to return a TcpSocket as we're overwriting from the base class
// just cast it to QSslSocket later
virtual QTcpSocket* nextPendingConnection();