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

Uemis downloader: start downloading using the correct dive ID

Browse source 
The logic to pick the initial dive ID for the uemis downloader was very
confused, and did not work at all when restarting a download when the
Uemis filled up, and the "Force download all dives" flag was set.  It
also required a rather odd Uemis-specific callback from the download UI
because of how it picked the initial ID.

This changes the logic to just look at the list of downloaded dives when
restarting, which simplifies the logic a lot, gets rid of the odd
special callback, and also means that the whole "Force download" issue
just goes away.  It seems to work now.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2015-09-19 21:09:58 -07:00 • committed by Dirk Hohndel
parent ad0806406b
commit e4d2092f33
4 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/downloadfromdivecomputer.cpp
View file

@ -298,14 +298,6 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked()
diveImportedModel->clearTable();
clear_table(&downloadTable);
}
if (ui.vendor->currentText() == "Uemis") {
if (currentState == ERROR && downloadTable.nr > 0)
// let the uemis code know how far we've gotten
uemis_set_max_diveid_from_dialog(downloadTable.dives[downloadTable.nr - 1]->dc.diveid);
else
// fresh download, so only look at what's in the dive_table
uemis_set_max_diveid_from_dialog(0);
}
updateState(DOWNLOADING);
// you cannot cancel the dialog, just the download