From 7648dfc54433b3c8917439999416984b4bfa211a Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Thu, 30 Dec 2021 08:19:06 +1100
Subject: [PATCH] Do not prompt to use previous version settings when newer
 version

---
 companion/src/companion.cpp       | 22 ++++++++--------------
 companion/src/storage/appdata.cpp |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/companion/src/companion.cpp b/companion/src/companion.cpp
index 7a431b8f4..5059d93ff 100644
--- a/companion/src/companion.cpp
+++ b/companion/src/companion.cpp
@@ -69,28 +69,22 @@ void checkSettingsImport(bool force = false)
   if (!found && !force)
     return;
 
-  const QString impFileBtn = QCoreApplication::translate("Companion", "Import from File");
-  const QString impPrevBtn = QCoreApplication::translate("Companion", "Import from v%1").arg(previousVersion);
-  const QString impNoneBtn = QCoreApplication::translate("Companion", "Do not import");
-
   QString msg;
   if (previousVersion.isEmpty()) {
+    const QString impFileBtn = QCoreApplication::translate("Companion", "Import from File");
+    const QString impNoneBtn = QCoreApplication::translate("Companion", "Do not import");
+
     if (found)
       msg = QCoreApplication::translate("Companion", "We have found possible Companion settings backup file(s).\nDo you want to import settings from a file?");
     else
       msg = QCoreApplication::translate("Companion", "Import settings from a file, or start with current values.");
+
+    const int ret = QMessageBox::question(nullptr, CPN_STR_APP_NAME, msg, impNoneBtn, impFileBtn, 0, 0);
+
+    if (!ret)
+      return;
   }
   else {
-    msg = QCoreApplication::translate("Companion", "We have found existing settings for Companion version: %1.\nDo you want to import them?\n\n" \
-                                                   "If you have a settings backup file, you may import that instead.").arg(previousVersion);
-  }
-
-  const int ret = QMessageBox::question(nullptr, CPN_STR_APP_NAME, msg, impNoneBtn, impFileBtn, (previousVersion.isEmpty() ? QString() : impPrevBtn), 0, 0);
-  if (!ret)
-    return;
-
-  // Import from previous version
-  if (ret == 2) {
     if (!g.importSettings(previousVersion)) {
       // very unlikely, but just in case of unexpected error, restart the import
       importError();
diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp
index f529c780c..34a5aea6e 100644
--- a/companion/src/storage/appdata.cpp
+++ b/companion/src/storage/appdata.cpp
@@ -471,7 +471,7 @@ void AppData::clearUnusedSettings(QSettings & settings)
 bool AppData::findPreviousVersionSettings(QString * version) const
 {
   //  TODO need a more dynamic method since ETX moves so quickly
-  static const QStringList versList({QStringLiteral("2.5"), QStringLiteral("2.4")});
+  static const QStringList versList({QStringLiteral("2.6"), QStringLiteral("2.5"), QStringLiteral("2.4")});
 
   for (const QString &ver : versList) {
     const QString prod("Companion " % ver);