From 455b3f384e1c8a347e744d8207f1b64df9822ee9 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 22 Jan 2026 17:22:29 +0300 Subject: [PATCH] =?UTF-8?q?BUSY=20=D0=B8=20FREE=20=D0=BF=D1=80=D0=BE=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=D1=8F=D1=82=20=D0=B4=D0=B0=D0=B6=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=B7=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp | 7 ------- LibInstructorsAndTrainees/instructorsandtraineeswidget.h | 2 -- LibServer/Systems/commonclienthandler.cpp | 3 ++- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp index f004a84..3a64d7e 100644 --- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -52,8 +52,6 @@ InstructorsAndTraineesWidget::InstructorsAndTraineesWidget(QWidget *parent) : connect(connectorToServer, &ConnectorToServer::sigLoginResult, this, &InstructorsAndTraineesWidget::slot_checkLoginResult); connect(connectorToServer, &ConnectorToServer::sigDeLoginResult, this, &InstructorsAndTraineesWidget::slot_checkDeLoginResult); - connect(connectorToServer, &ConnectorToServer::sigTryBlockResult, this, &InstructorsAndTraineesWidget::slot_checkTryBlockResult); - connect(connectorToServer, &ConnectorToServer::sigServerBlocked, this, &InstructorsAndTraineesWidget::slot_ServerBlocked); connect(connectorToServer, &ConnectorToServer::sigErrorAuth, this, &InstructorsAndTraineesWidget::slot_ErrorAuth); connect(connectorToServer, &ConnectorToServer::signal_SetVersion, this, &InstructorsAndTraineesWidget::slot_SetVersion); @@ -292,11 +290,6 @@ void InstructorsAndTraineesWidget::slot_checkDeLoginResult(ServerDeAuthorization } } -void InstructorsAndTraineesWidget::slot_checkTryBlockResult(bool result, QString type) -{ - -} - void InstructorsAndTraineesWidget::slot_ServerBlocked() { if(flTryLogin) diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.h b/LibInstructorsAndTrainees/instructorsandtraineeswidget.h index 40b2183..23d1bb4 100644 --- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.h +++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.h @@ -54,8 +54,6 @@ public Q_SLOTS: //Слот обработки результата деавторизации void slot_checkDeLoginResult(ServerDeAuthorization * serverDeAuth); - void slot_checkTryBlockResult(bool result, QString type); - void slot_ServerBlocked(); void slot_ErrorAuth(QString error); void slot_SetVersion(StreamingVersionData* serverVersion); diff --git a/LibServer/Systems/commonclienthandler.cpp b/LibServer/Systems/commonclienthandler.cpp index edae0f8..0c31014 100644 --- a/LibServer/Systems/commonclienthandler.cpp +++ b/LibServer/Systems/commonclienthandler.cpp @@ -111,7 +111,8 @@ void CommonClientHandler::slot_sendPacketToAllClients(PacketType packetType) { ClientHandler *handler = clientsMap->value(idSocket); - if (!handler->getClient()->getIsLoggedIn()) continue; + if(packetType != PacketType::BUSY && packetType != PacketType::FREE) + if (!handler->getClient()->getIsLoggedIn()) continue; handler->sendPacketType(packetType); Logger::instance().log("AllSending " + handler->getClient()->getLogin() + " " + enumToString(packetType));