From e5111b4716814e8b3c0e94ad3512fbb587464000 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 23 Feb 2020 09:53:04 +0200
Subject: [PATCH] IMPORTANT:fix first run initialization

--dont mess the old migrating process during startup
with a new user that uses Latte for first time. This
is a very important step during startup otherwise the
entire Latte experiences instability.

BUG:417886
FIXED-IN:0.9.9
---
 app/layouts/importer.cpp           |  2 +-
 app/layouts/manager.cpp            | 26 +++++++++++++++++---------
 app/settings/universalsettings.cpp |  1 +
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/layouts/importer.cpp b/app/layouts/importer.cpp
index 155a4212e..bfe2c86cf 100644
--- a/app/layouts/importer.cpp
+++ b/app/layouts/importer.cpp
@@ -79,8 +79,8 @@ bool Importer::updateOldConfiguration()
         }
     }
 
-    m_manager->corona()->universalSettings()->setCurrentLayoutName(i18n("My Layout"));
     m_manager->corona()->universalSettings()->setVersion(2);
+    m_manager->corona()->universalSettings()->setCurrentLayoutName(i18n("My Layout"));
 
     return true;
 }
diff --git a/app/layouts/manager.cpp b/app/layouts/manager.cpp
index 20d1b9696..1aea22db4 100644
--- a/app/layouts/manager.cpp
+++ b/app/layouts/manager.cpp
@@ -81,25 +81,33 @@ void Manager::load()
 {
     m_presetsPaths.clear();
 
+    QDir layoutsDir(QDir::homePath() + "/.config/latte");
+    bool firstRun = !layoutsDir.exists();
+
     int configVer = m_corona->universalSettings()->version();
     qDebug() << "Universal Settings version : " << configVer;
 
-    if (configVer < 2 && QFile(QDir::homePath() + "/.config/lattedockrc").exists()) {
-        qDebug() << "Latte must update its configuration...";
-        m_importer->updateOldConfiguration();
-        importPresets(false);
-    } else if (!QFile(QDir::homePath() + "/.config/lattedockrc").exists()) {
-        //startup create what is necessary....
-        QDir layoutDir(QDir::homePath() + "/.config/latte");
+    if (firstRun) {
+        m_corona->universalSettings()->setVersion(2);
+        m_corona->universalSettings()->setCurrentLayoutName(i18n("My Layout"));
 
-        if (!layoutDir.exists()) {
+        //startup create what is necessary....
+        if (!layoutsDir.exists()) {
             QDir(QDir::homePath() + "/.config").mkdir("latte");
         }
 
         newLayout(i18n("My Layout"));
         importPresets(false);
-        m_corona->universalSettings()->setCurrentLayoutName(i18n("My Layout"));
+    } else if (configVer < 2 && !firstRun) {
         m_corona->universalSettings()->setVersion(2);
+
+        bool isOlderVersion = m_importer->updateOldConfiguration();
+        if (isOlderVersion) {
+            qDebug() << "Latte is updating its older configuration...";
+            importPresets(false);
+        } else {
+            m_corona->universalSettings()->setCurrentLayoutName(i18n("My Layout"));
+        }
     }
 
     //! Check if the multiple-layouts hidden file is present, add it if it isnt
diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp
index f5ad7f822..6acc864b4 100644
--- a/app/settings/universalsettings.cpp
+++ b/app/settings/universalsettings.cpp
@@ -139,6 +139,7 @@ void UniversalSettings::setVersion(int ver)
     }
 
     m_version = ver;
+    qDebug() << "Universal Settings version updated to : " << m_version;
 
     emit versionChanged();
 }