Fixes for "Read Models and Settings from the radio": (#4291)

* show errors
 * close dialog in nothing in progress widget
This commit is contained in:
Damjan Adamic
2017-01-26 18:24:27 +01:00
committed by Bertrand Songis
parent 1202fa84fa
commit 8102f870fe
6 changed files with 26 additions and 7 deletions
+7 -2
View File
@@ -754,7 +754,7 @@ bool MainWindow::readFirmwareFromRadio(const QString & filename)
{
ProgressDialog progressDialog(this, tr("Read Firmware from Radio"), CompanionIcon("read_flash.png"));
bool result = readFirmware(filename, progressDialog.progress());
if (!result) {
if (!result && !progressDialog.isEmpty()) {
progressDialog.exec();
}
return result;
@@ -765,7 +765,12 @@ bool MainWindow::readEepromFromRadio(const QString & filename)
ProgressDialog progressDialog(this, tr("Read Models and Settings from Radio"), CompanionIcon("read_eeprom.png"));
bool result = ::readEeprom(filename, progressDialog.progress());
if (!result) {
progressDialog.exec();
if (!progressDialog.isEmpty()) {
progressDialog.exec();
}
}
else {
statusBar()->showMessage(tr("Models and Settings read"), 2000);
}
return result;
}