From 097702a39216311b2f2e32d56f66318ba9f0d34a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 9 Nov 2012 23:00:54 +0100 Subject: Ignore last dive read from Uemis when starting with empty divelist When the user closes the divelist and starts with an empty file it makes no sense to assume that she only wants to download new dives since the last time dives have been downloaded. So if the current divelist is empty we ignore that information and start from the beginning again. Signed-off-by: Dirk Hohndel --- uemis-downloader.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'uemis-downloader.c') diff --git a/uemis-downloader.c b/uemis-downloader.c index 5267a0b00..6f85eca59 100644 --- a/uemis-downloader.c +++ b/uemis-downloader.c @@ -792,7 +792,15 @@ static char *do_uemis_download(struct argument_block *args) if (! uemis_get_answer(mountpath, "processSync", 0, 2, &result)) goto bail; param_buff[1] = "notempty"; - newmax = get_divenr(*max_dive_data, deviceid); + /* if we have an empty divelist then the user will almost + * certainly want to start downloading from the first dive on + * the Uemis; otherwise check which was the last dive + * downloaded */ + if (dive_table.nr > 0) + newmax = get_divenr(*max_dive_data, deviceid); + else + newmax = strdup("0"); + if (sscanf(newmax, "%d", &start) != 1) start = 0; for (;;) { -- cgit v1.2.3-70-g09d2