From dc9cf7bcbccba78c64c4e935341d816798b6dc03 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Mon, 24 Apr 2017 18:29:33 +0200 Subject: [PATCH] OSTC3 incorrect notice to upgrade firmware See https://github.com/Subsurface-divelog/subsurface/issues/342. The reason is that we never get a DC_EVENT_DEVINFO when doing a memory dump. Just do not offer to update firmware when we are creating a libdc dump. Full credits of this fix go to Anton. Fixed-by: Anton Lundin Signed-off-by: Jan Mulder --- desktop-widgets/downloadfromdivecomputer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index 8225b23ad..a46c5f141 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -385,9 +385,11 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked() // You can enter "OSTC 3" and download just fine from a "OSTC Sport", but // this check will compair apples and oranges, firmware wise, then. QString product(ui.product->currentText()); - if (product == "OSTC 3" || product == "OSTC 3+" || + // + // We shouldn't do this for memory dumps. + if ((product == "OSTC 3" || product == "OSTC 3+" || product == "OSTC Cr" || product == "OSTC Sport" || - product == "OSTC 4") + product == "OSTC 4") && !data.libdc_dump) ostcFirmwareCheck = new OstcFirmwareCheck(product); }