[PATCH 4/5] Disable update firmware button on any other action

Anton Lundin glance at acc.umu.se
Thu Sep 24 15:59:05 PDT 2015


Firmware updates can only be done on a newly opened device.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 qt-ui/configuredivecomputerdialog.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qt-ui/configuredivecomputerdialog.cpp b/qt-ui/configuredivecomputerdialog.cpp
index eb790e6..f42680b 100644
--- a/qt-ui/configuredivecomputerdialog.cpp
+++ b/qt-ui/configuredivecomputerdialog.cpp
@@ -722,6 +722,8 @@ void ConfigureDiveComputerDialog::readSettings()
 	ui.progressBar->setValue(0);
 	ui.progressBar->setFormat("%p%");
 	ui.progressBar->setTextVisible(true);
+	// Fw update is no longer a option, needs to be done on a untouched device
+	ui.updateFirmwareButton->setEnabled(false);
 
 	config->readSettings(&device_data);
 }
@@ -1098,6 +1100,8 @@ void ConfigureDiveComputerDialog::on_restoreBackupButton_clicked()
 	QString restorePath = QFileDialog::getOpenFileName(this, tr("Restore dive computer settings"),
 							   filename, tr("Backup files (*.xml)"));
 	if (!restorePath.isEmpty()) {
+		// Fw update is no longer a option, needs to be done on a untouched device
+		ui.updateFirmwareButton->setEnabled(false);
 		if (!config->restoreXMLBackup(restorePath, deviceDetails)) {
 			QMessageBox::critical(this, tr("XML restore error"),
 					      tr("An error occurred while restoring the backup file.\n%1")
-- 
2.1.4



More information about the subsurface mailing list