From 655e2f90107ba0b29f2764c3b5c69c537875dfe5 Mon Sep 17 00:00:00 2001
From: Max Paperno <max@wdg.us>
Date: Wed, 7 Jun 2017 10:47:32 -0400
Subject: [PATCH] [Companion][AppData] Fix possible crash when importing
 settings from Companion < v2.1 (fixes #5016).

---
 companion/src/storage/appdata.cpp | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp
index d047ad0f1..0f298eda7 100644
--- a/companion/src/storage/appdata.cpp
+++ b/companion/src/storage/appdata.cpp
@@ -683,37 +683,37 @@ bool AppData::importSettings(QSettings & toSettings)
     settings21.clear();
   }
 
-  if (!fromSettings) {
-    QSettings settings20("OpenTX", "Companion 2.0");
-    if (settings20.contains("settings_version")) {
+  QSettings settings20("OpenTX", "Companion 2.0");
+  if (settings20.contains("settings_version")) {
+    if (!fromSettings) {
       fromSettings = &settings20;
       upgradeFromVersion = "2.0";
     }
-    else {
-      settings20.clear();
-    }
+  }
+  else {
+    settings20.clear();
   }
 
-  if (!fromSettings) {
-    QSettings settings16("OpenTX", "OpenTX Companion");
-    if (settings16.contains("settings_version")) {
+  QSettings settings16("OpenTX", "OpenTX Companion");
+  if (settings16.contains("settings_version")) {
+    if (!fromSettings) {
       fromSettings = &settings16;
       upgradeFromVersion = "1.x";
     }
-    else {
-      settings16.clear();
-    }
+  }
+  else {
+    settings16.clear();
   }
 
-  if (!fromSettings) {
-    QSettings settings9x("companion9x", "companion9x");
-    if (settings9x.contains("default_mode")) {
+  QSettings settings9x("companion9x", "companion9x");
+  if (settings9x.contains("default_mode")) {
+    if (!fromSettings) {
       fromSettings = &settings9x;
       upgradeFromVersion = "Companion9X";
     }
-    else {
-      settings9x.clear();
-    }
+  }
+  else {
+    settings9x.clear();
   }
 
   if (!fromSettings)