From 4605f9d61dbc896df99205610eae52e738ebb0b8 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 25 Oct 2015 20:09:26 +0100
Subject: [PATCH] Companion settings moved to 2.2 directory

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

diff --git a/companion/src/appdata.cpp b/companion/src/appdata.cpp
index e6e45029d..86b7db3e9 100644
--- a/companion/src/appdata.cpp
+++ b/companion/src/appdata.cpp
@@ -604,8 +604,28 @@ AppData::AppData()
     for (int i=0; i<MAX_JOYSTICKS; i++)
         joystick[i].init( i );
 
-    // Copy existing 2.0.16 settings if present
     QSettings settings(COMPANY, PRODUCT);
+
+    // Copy existing 2.1 settings if present
+    if (profile[0].name().isEmpty())
+    {
+        QSettings settings21("OpenTX", "Companion 2.1");
+
+        QStringList keys = settings21.allKeys();
+        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
+        {
+            if (settings21.value(*i) != QString("") && settings21.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, settings21.value(*i));
+            }
+        }
+
+        //Reload profiles
+        for (int i=0; i<MAX_PROFILES; i++)
+            profile[i].init( i );
+    }
+
+    // Copy existing 2.0 settings if present
     if (profile[0].name().isEmpty())
     {
         QSettings settings20("OpenTX", "Companion 2.0");
diff --git a/companion/src/appdata.h b/companion/src/appdata.h
index d80dd115d..c435ff769 100644
--- a/companion/src/appdata.h
+++ b/companion/src/appdata.h
@@ -25,7 +25,7 @@
 #include <QSettings>
 
 #define COMPANY "OpenTX"
-#define PRODUCT "Companion 2.1"
+#define PRODUCT "Companion 2.2"
 
 #define MAX_PROFILES 15
 #define MAX_JOYSTICKS 8