From 8a3af93b39b05b95462869fc7df7169c5862c966 Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Thu, 23 Jun 2016 21:00:46 +0200
Subject: fixed creation of data paths after changing paths in settings and
 update of profile list after change

---
 src/organizercore.cpp | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 6ceefb4b..b5e5118d 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -586,6 +586,25 @@ InstallationManager *OrganizerCore::installationManager()
   return &m_InstallationManager;
 }
 
+bool OrganizerCore::createDirectory(const QString &path) {
+  if (!QDir(path).exists() && !QDir().mkpath(path)) {
+    QMessageBox::critical(nullptr, QObject::tr("Error"),
+                          QObject::tr("Failed to create \"%1\". Your user "
+                                      "account probably lacks permission.")
+                              .arg(QDir::toNativeSeparators(path)));
+    return false;
+  } else {
+    return true;
+  }
+}
+
+bool OrganizerCore::bootstrap() {
+  return createDirectory(m_Settings.getProfileDirectory()) &&
+         createDirectory(m_Settings.getModDirectory()) &&
+         createDirectory(m_Settings.getDownloadDirectory()) &&
+         createDirectory(m_Settings.getOverwriteDirectory());
+}
+
 void OrganizerCore::createDefaultProfile()
 {
   QString profilesPath = settings().getProfileDirectory();
@@ -610,7 +629,19 @@ void OrganizerCore::setCurrentProfile(const QString &profileName)
       && (profileName == m_CurrentProfile->name())) {
     return;
   }
-  QString profileDir  = settings().getProfileDirectory() + "/" + profileName;
+
+  QDir profileBaseDir(settings().getProfileDirectory());
+  QString profileDir = profileBaseDir.absoluteFilePath(profileName);
+
+  if (!QDir(profileDir).exists()) {
+    // selected profile doesn't exist. Ensure there is at least one profile,
+    // then pick any one
+    createDefaultProfile();
+
+    profileDir = profileBaseDir.absoluteFilePath(
+        profileBaseDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot).at(0));
+  }
+
   Profile *newProfile = new Profile(QDir(profileDir), managedGame());
 
   delete m_CurrentProfile;
@@ -1870,7 +1901,7 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString &profileName,
 
   result.insert(result.end(), {
                   QDir::toNativeSeparators(m_Settings.getOverwriteDirectory()),
-                  QDir::toNativeSeparators(game->dataDirectory().absolutePath()),
+                  dataPath,
                   true,
                   customOverwrite.isEmpty()
                 });
-- 
cgit v1.3.1