mirror of
https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git
synced 2026-03-27 19:45:43 +03:00
Merge branch 'DEV' into draft-send-contacts
This commit is contained in:
@@ -27,7 +27,7 @@ void RecognizeSystem::initialize(UpdateController *updateController,DataParser*
|
||||
connect(this,&RecognizeSystem::sigChangeVersion,updateController,&UpdateController::changeAssetVersion,Qt::AutoConnection);
|
||||
connect(this,&RecognizeSystem::sigDeleteVersion,updateController,&UpdateController::deleteAssetVersion,Qt::AutoConnection);
|
||||
connect(this,&RecognizeSystem::sigCopyVersion,updateController,&UpdateController::createCopyVersion,Qt::AutoConnection);
|
||||
connect(this,&RecognizeSystem::sigXmlParser,dataParser->getProcessParser(),&ProcessParser::read,Qt::DirectConnection);
|
||||
connect(this,&RecognizeSystem::sigXmlParser,dataParser->getProcessParser(),&ProcessParser::slot_read,Qt::DirectConnection);
|
||||
|
||||
qDebug() << "Recognize init thread ID " << QThread::currentThreadId();
|
||||
}
|
||||
@@ -430,7 +430,7 @@ void RecognizeSystem::recognize()
|
||||
|
||||
if(packetType == PacketType::TYPE_DISABLE)
|
||||
{
|
||||
clientHandler->sendDisable();
|
||||
clientHandler->sendDisable();
|
||||
}
|
||||
|
||||
packetType = PacketType::TYPE_NONE;
|
||||
@@ -450,6 +450,7 @@ void RecognizeSystem::packetTypeInit(PacketType packet,Client *client)
|
||||
else if (packet == PacketType::TYPE_UNITY)
|
||||
{
|
||||
client->setUnity(true);
|
||||
//Фиксируем время входа Юнити-клиента
|
||||
}
|
||||
|
||||
isPackageTypeInited = true;
|
||||
|
||||
Reference in New Issue
Block a user