mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix for left over CIV client on server

merge-requests/6/head
Phil Taylor 2021-08-15 14:41:54 +01:00
rodzic 04562a6ca5
commit fc2d1e24e2
1 zmienionych plików z 16 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
udpserver.cpp
Wyświetl plik

@ -461,7 +461,6 @@ void udpServer::civReceived()
if (current == Q_NULLPTR)
{
current = new CLIENT();
foreach(CLIENT* client, controlClients)
{
if (client != Q_NULLPTR)
@ -474,6 +473,13 @@ void udpServer::civReceived()
}
}
if (current->controlClient == Q_NULLPTR || !current->controlClient->isAuthenticated)
{
// There is no current controlClient that matches this civClient
delete current;
return;
}
current->type = "CIV";
current->civId = 0;
current->connected = true;
@ -504,10 +510,6 @@ void udpServer::civReceived()
}
if (current->controlClient == Q_NULLPTR || !current->controlClient->isAuthenticated)
{
return;
}
switch (r.length())
{
@ -621,6 +623,14 @@ void udpServer::audioReceived()
}
}
}
if (current->controlClient == Q_NULLPTR || !current->controlClient->isAuthenticated)
{
// There is no current controlClient that matches this audioClient
delete current;
return;
}
current->type = "Audio";
current->connected = true;
current->timeConnected = QDateTime::currentDateTime();
@ -1581,6 +1591,7 @@ void udpServer::deleteConnection(QList<CLIENT*>* l, CLIENT* c)
while (it != l->end()) {
CLIENT* client = *it;
if (client != Q_NULLPTR && client == c) {
qInfo(logUdpServer()) << "Found" << client->type << "connection to: " << client->ipAddress.toString() << ":" << QString::number(client->port);
it = l->erase(it);
}
else {