From 34ddc1623a935678796e41d2e8d3f3fe33391c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Sat, 26 Aug 2017 18:11:00 +0200
Subject: [PATCH] Some minor fixes to path handling for installer

---
 Vocaluxe/Base/CConfig.cs | 12 ++++++------
 Vocaluxe/Program.cs      |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs
index 7d12b96c..89b87be3 100644
--- a/Vocaluxe/Base/CConfig.cs
+++ b/Vocaluxe/Base/CConfig.cs
@@ -193,11 +193,11 @@ namespace Vocaluxe.Base
         //Folders
         public static readonly List<string> SongFolders = new List<string>
             {
-#if WIN
-            CSettings.FolderNameSongs
-#elif INSTALLER
+#if INSTALLER
             CSettings.FolderNameSongs,
             Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
+#elif WIN
+            CSettings.FolderNameSongs
 #elif LINUX
             Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
 #endif
@@ -208,11 +208,11 @@ namespace Vocaluxe.Base
         /// </summary>
         public static readonly List<string> ProfileFolders = new List<string>
             {
-#if WIN
-            CSettings.FolderNameProfiles
-#elif INSTALLER
+#if INSTALLER
             CSettings.FolderNameProfiles,
             Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles)
+#elif WIN
+            CSettings.FolderNameProfiles
 #elif LINUX
             Path.Combine(CSettings.DataFolder, CSettings.FolderNameProfiles)
 #endif
diff --git a/Vocaluxe/Program.cs b/Vocaluxe/Program.cs
index 4da68bf2..0a13d82f 100644
--- a/Vocaluxe/Program.cs
+++ b/Vocaluxe/Program.cs
@@ -111,6 +111,10 @@ namespace Vocaluxe
 
                 Application.DoEvents();
 
+                // Create folders
+                // Do this before starting benchmarks so data folder could be created properly
+                CSettings.CreateFolders();
+
                 // load config
                 CLog.StartBenchmark("Init Config");
                 CConfig.LoadCommandLineParams(args);
@@ -119,9 +123,6 @@ namespace Vocaluxe
                 CConfig.UseCommandLineParamsAfter();
                 CLog.StopBenchmark("Init Config");
 
-                // Create folders
-                CSettings.CreateFolders();
-
                 _SplashScreen = new CSplashScreen();
                 Application.DoEvents();