Fix T16 companion inport warning (#6965)

* Add JumperTX wartning also when reading from radio * Reuse * Reword * Cosmetics * Cosmetics
2019-10-18 16:15:21 +02:00
parent 5a298a2362
commit 8b49daa455
4 changed files with 25 additions and 12 deletions
@@ -333,6 +333,11 @@ bool readEeprom(const QString & filename, ProgressWidget * progress)
      QMessageBox::critical(progress, CPN_STR_TTL_ERROR, outputStorage.error());
      return false;
    }
+
+    if (getCurrentBoard() == Board::BOARD_JUMPER_T16 && inputStorage.getBoard() == Board::BOARD_X10) {
+      if (displayT16ImportWarning() == false)
+        return false;
+    }
  }
  else {
    if (IS_ARM(board)) {