From 08756af9f597d8cd4f26a61544134b049c00cb66 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 8 Aug 2015 11:20:21 +0200
Subject: [PATCH] Don't import install dir settings from old versions (fix
 #2645)

---
 companion/src/appdata.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/companion/src/appdata.cpp b/companion/src/appdata.cpp
index d49f7a5af..187bd6cb8 100644
--- a/companion/src/appdata.cpp
+++ b/companion/src/appdata.cpp
@@ -613,7 +613,10 @@ AppData::AppData()
         QStringList keys = settings20.allKeys();
         for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
         {
-            settings.setValue(*i, settings20.value(*i));
+            if (settings20.value(*i) != QString("") && settings20.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, settings20.value(*i));
+            }
         }
 
         //Reload profiles
@@ -629,7 +632,10 @@ AppData::AppData()
         QStringList keys = pre2016settings.allKeys();
         for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
         {
-            settings.setValue(*i, pre2016settings.value(*i));
+            if (pre2016settings.value(*i) != QString("") && pre2016settings.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, pre2016settings.value(*i));
+            }
         }
 
         //Reload profiles