mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: divehare avoid race problem.

Browse source 
Do reply->readAll() before reply-deleteLater()

With UI deleteLater() seems to happen after the function exist,
but with QML it causes problems.

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-12 12:57:56 +01:00 • committed by Dirk Hohndel
parent aefe87112a
commit 820d9bcd56
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/uploadDiveShare.cpp
View file

@ -76,12 +76,13 @@ void uploadDiveShare::updateProgressSlot(qint64 current, qint64 total)
void uploadDiveShare::uploadFinishedSlot() void uploadDiveShare::uploadFinishedSlot()
{ {
QByteArray html = reply->readAll();
reply->deleteLater(); reply->deleteLater();
timeout.stop(); timeout.stop();
if (reply->error() != 0) { if (reply->error() != 0) {
emit uploadFinish(false, reply->errorString(), reply->readAll()); emit uploadFinish(false, reply->errorString(), html);
} else { } else {
emit uploadFinish(true, tr("Upload successful"), reply->readAll()); emit uploadFinish(true, tr("Upload successful"), html);
} }
} }