From 122111402d5988e8c8781ce1328fefa0f8bbf2df Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 21 Apr 2015 19:31:05 -0700 Subject: Uemis downloader: get the right values set before bailing This caused us to not read the auxiliary information for up to the last ten dives that were downloaded from the SDA. Signed-off-by: Dirk Hohndel --- uemis-downloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'uemis-downloader.c') diff --git a/uemis-downloader.c b/uemis-downloader.c index 93d5e3997..ed3e94ec6 100644 --- a/uemis-downloader.c +++ b/uemis-downloader.c @@ -906,8 +906,14 @@ const char *do_uemis_import(device_data_t *data) free(t); once = false; } + /* clean up mbuf */ + endptr = strstr(mbuf, "{{{"); + if (endptr) + *(endptr + 2) = '\0'; + /* last object_id we parsed */ + sscanf(newmax, "%d", &end); #if UEMIS_DEBUG & 4 - fprintf(debugfile, "d_u_i after download and parse start %d end %d newmax %s\n", start, end, newmax); + fprintf(debugfile, "d_u_i after download and parse start %d end %d newmax %s progress %4.2f\n", start, end, newmax, progress_bar_fraction); #endif /* if the user clicked cancel, exit gracefully */ if (import_thread_cancelled) @@ -920,12 +926,6 @@ const char *do_uemis_import(device_data_t *data) result = translate("gettextFromC", ERR_FS_ALMOST_FULL); break; } - /* clean up mbuf */ - endptr = strstr(mbuf, "{{{"); - if (endptr) - *(endptr + 2) = '\0'; - /* last object_id we parsed */ - sscanf(newmax, "%d", &end); } if (end == -2 && sscanf(newmax, "%d", &end) != 1) end = start; -- cgit v1.2.3-70-g09d2