From 6e8968ee1fdcde2639390738db171dbdb95cba74 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 3 Jul 2025 10:22:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20~C?= =?UTF-8?q?onnectorToServer()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/Core/tcpclient.cpp | 1 - .../connectorToServer/connectortoserver.cpp | 18 ++++++++++++++++++ .../connectorToServer/connectortoserver.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp b/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp index 86b9151..6328fe0 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp @@ -60,7 +60,6 @@ void TCPClient::setDisconnect() stream.setVersion(QDataStream::Qt_DefaultCompiledVersion); stream << PacketType::TYPE_DISABLE; - socket->disconnect(); isConnected = false; diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 4ebaa11..e8523e6 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -17,6 +17,24 @@ ConnectorToServer::ConnectorToServer(QWidget* parentWidget, QObject *parent) : initialize(); } +ConnectorToServer::~ConnectorToServer() +{ + waitAnimationWidget->hideWithStop(); + + delete waitAnimationWidget; + delete client; + delete versionSelectWidget; + delete notifyController; + delete versionContainer; + delete recognizeSystem; + delete sendSystem; + delete dataParser; + + connectionThread->quit(); + connectionThread->wait(); + delete connectionThread; +} + bool ConnectorToServer::authorizationInstructorLocal(QString login, QString password) { if (!client->getIsConnected()) diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index cc56f92..71e9a67 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -22,6 +22,7 @@ class ConnectorToServer : public QObject Q_OBJECT public: explicit ConnectorToServer(QWidget* parentWidget, QObject *parent = nullptr); + ~ConnectorToServer(); bool authorizationInstructorLocal(QString login, QString password); bool deAuthorizationInstructorLocal(QString login);