Uuemis downloader: make sure import reacts to cancel

Fixed a bug where the import did not react on the cancel button by adding
the check into the helper function as well.

Signed-off-by: glerch <guido.lerch@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
glerch 2015-09-16 09:10:56 +02:00 committed by Dirk Hohndel
parent 9d56165fd1
commit e8ae51b876

View file

@ -1094,6 +1094,8 @@ static bool get_matching_dive(int idx, int *dive_to_read, int *last_found_log_fi
snprintf(log_file_no_to_find, sizeof(log_file_no_to_find), "logfilenr{int{%d", dive->dc.diveid);
while (!found) {
if (import_thread_cancelled)
break;
snprintf(dive_to_read_buf, sizeof(dive_to_read_buf), "%d", *dive_to_read);
param_buff[2] = dive_to_read_buf;
(void)uemis_get_answer(mountpath, "getDive", 3, 0, NULL);
@ -1273,6 +1275,8 @@ const char *do_uemis_import(device_data_t *data)
bool success = get_matching_dive(i, &dive_to_read, &last_found_log_file_nr, &deleted_files, newmax, &uemis_mem_status, data, mountpath, deviceidnr);
if (!success)
break;
if (import_thread_cancelled)
break;
}
start = end;