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

move process_dives to the mainthread

Browse source 
Avoids a race condition.

Signed-off-by: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
This commit is contained in:
Danilo Cesar Lemes de Paula 2013-09-17 18:36:22 -03:00
parent f8e33e171a
commit 608209fff2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qt-ui/downloadfromdivecomputer.cpp
View file

@ -261,6 +261,10 @@ void DownloadFromDCWidget::onDownloadThreadFinished()
updateState(DONE); updateState(DONE);
else else
updateState(ERROR); updateState(ERROR);
// I'm not sure if we should really call process_dives even
// if there's an error or a cancelation
process_dives(TRUE, preferDownloaded());
} else } else
updateState(CANCELLED); updateState(CANCELLED);
} }
@ -320,7 +324,6 @@ static QString str_error(const char *fmt, ...)
void DownloadThread::run() void DownloadThread::run()
{ {
DownloadFromDCWidget *dfdcw = DownloadFromDCWidget::instance();
const char *error; const char *error;
if (!strcmp(data->vendor, "Uemis")) if (!strcmp(data->vendor, "Uemis"))
@ -331,8 +334,4 @@ void DownloadThread::run()
if (error) { if (error) {
this->error = str_error(error, data->devname, data->vendor, data->product); this->error = str_error(error, data->devname, data->vendor, data->product);
} }
// I'm not sure if we should really call process_dives even
// if there's an error or a cancelation
process_dives(TRUE, dfdcw->preferDownloaded());
} }