From 3b0cf02574c52d2169cb91ee9e588466d9cdca57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20L?= Date: Fri, 8 Sep 2017 00:01:26 +0200 Subject: [PATCH] Server: QThread wasn't actually used... --- WSServer.cpp | 16 ++++++---------- WSServer.h | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/WSServer.cpp b/WSServer.cpp index 85b3c3b3..877b7083 100644 --- a/WSServer.cpp +++ b/WSServer.cpp @@ -30,22 +30,18 @@ QT_USE_NAMESPACE WSServer* WSServer::Instance = nullptr; -WSServer::WSServer(QObject* parent) : - QObject(parent), - _wsServer(Q_NULLPTR), - _clients(), - _clMutex(QMutex::Recursive) { - _serverThread = new QThread(); +WSServer::WSServer(QObject* parent) + : QObject(parent), + _wsServer(Q_NULLPTR), + _clients(), + _clMutex(QMutex::Recursive) { _wsServer = new QWebSocketServer( QStringLiteral("obs-websocket"), - QWebSocketServer::NonSecureMode, - _serverThread); - _serverThread->start(); + QWebSocketServer::NonSecureMode); } WSServer::~WSServer() { Stop(); - delete _serverThread; } void WSServer::Start(quint16 port) { diff --git a/WSServer.h b/WSServer.h index 6ab6ea0e..010c4bd3 100644 --- a/WSServer.h +++ b/WSServer.h @@ -47,7 +47,6 @@ class WSServer : public QObject { QWebSocketServer* _wsServer; QList _clients; QMutex _clMutex; - QThread* _serverThread; }; #endif // WSSERVER_H \ No newline at end of file