flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 12:55:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T730, reply in CAfvClient can be nullptr when called from another thread

Browse Source 
* nullptr is a normal condition
* see https://discordapp.com/channels/539048679160676382/623947987822837779/629780397986676766
This commit is contained in:
Klaus Basan
2019-10-05 01:54:17 +02:00
committed by Mat Sutcliffe
parent 226b601565
commit 4c170e0ac4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/afv/connection/apiserverconnection.cpp
View File

@@ -65,7 +65,7 @@ namespace BlackCore
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QEventLoop loop(sApp); QEventLoop loop(sApp);
// posted in QAM thread // posted in QAM thread, reply is nullptr if called from another thread
QNetworkReply *reply = sApp->postToNetwork(request, CApplication::NoLogRequestId, QJsonDocument(obj).toJson(), QNetworkReply *reply = sApp->postToNetwork(request, CApplication::NoLogRequestId, QJsonDocument(obj).toJson(),
{ {
this, [ & ](QNetworkReply * nwReply) this, [ & ](QNetworkReply * nwReply)
@@ -118,8 +118,9 @@ namespace BlackCore
loop.exit(); loop.exit();
} }
}); });
Q_UNUSED(reply)
if (reply) { loop.exec(); } loop.exec();
return m_isAuthenticated; return m_isAuthenticated;
} }
@@ -162,7 +163,7 @@ namespace BlackCore
QEventLoop loop(sApp); QEventLoop loop(sApp);
QByteArray receivedData; QByteArray receivedData;
// posted in QAM thread // posted in QAM thread, reply is nullptr if called from another thread
QNetworkReply *reply = sApp->getFromNetwork(request, QNetworkReply *reply = sApp->getFromNetwork(request,
{ {
this, [ & ](QNetworkReply * nwReply) this, [ & ](QNetworkReply * nwReply)
@@ -185,8 +186,8 @@ namespace BlackCore
loop.exit(); loop.exit();
} }
}); });
Q_UNUSED(reply)
if (!reply) { return {}; }
loop.exec(); loop.exec();
return receivedData; return receivedData;
} }
@@ -198,7 +199,7 @@ namespace BlackCore
QEventLoop loop(sApp); QEventLoop loop(sApp);
QByteArray receivedData; QByteArray receivedData;
// posted in QAM thread // posted in QAM thread, reply is nullptr if called from another thread
QNetworkReply *reply = sApp->postToNetwork(request, CApplication::NoLogRequestId, data, QNetworkReply *reply = sApp->postToNetwork(request, CApplication::NoLogRequestId, data,
{ {
this, [ & ](QNetworkReply * nwReply) this, [ & ](QNetworkReply * nwReply)
@@ -221,8 +222,8 @@ namespace BlackCore
loop.exit(); loop.exit();
} }
}); });
Q_UNUSED(reply)
if (!reply) { return {}; }
loop.exec(); loop.exec();
return receivedData; return receivedData;
} }
@@ -244,7 +245,7 @@ namespace BlackCore
request.setRawHeader("Authorization", "Bearer " + m_jwt); request.setRawHeader("Authorization", "Bearer " + m_jwt);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
// posted in QAM thread // posted in QAM thread, reply is nullptr if called from another thread
sApp->postToNetwork(request, CApplication::NoLogRequestId, json.toJson(), sApp->postToNetwork(request, CApplication::NoLogRequestId, json.toJson(),
{ {
this, [ & ](QNetworkReply * nwReply) this, [ & ](QNetworkReply * nwReply)