From a3ea1d51f9a52902fa44a734b98d00b5b71f83af Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 8 Jan 2015 09:29:57 -0800 Subject: Dive d/l selection UI: don't close the dialog when we're done downloading The whole point is that we then want to pick and choose which dives to add to the divelist. Signed-off-by: Dirk Hohndel --- qt-ui/downloadfromdivecomputer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index 3181faba8..730a7b8a5 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -134,9 +134,8 @@ void DownloadFromDCWidget::updateState(states state) } // DOWNLOAD is finally done, but we don't know if there was an error as libdivecomputer doesn't pass - // that information on to us - // so check the progressBar text and if no error was reported, close the dialog and go back to the main window - // otherwise treat this as if the download was cancelled + // that information on to us. + // If we find an error, offer to retry, otherwise continue the interaction to pick the dives the user wants else if (currentState == DOWNLOADING && state == DONE) { timer->stop(); if (QString(progress_bar_text).contains("error", Qt::CaseInsensitive)) { @@ -148,7 +147,6 @@ void DownloadFromDCWidget::updateState(states state) ui.progressBar->setValue(100); markChildrenAsEnabled(); ui.ok->setText(tr("OK")); - accept(); } } -- cgit v1.2.3-70-g09d2