Some minor fixes to path handling for installer

This commit is contained in:
Florian Küpper committed 2017-08-26 18:11:00 +02:00
1 parent 7ae2e33024
commit 34ddc1623a
2 files changed
+10 -9

No files matched your search

+6 -6
View File
@@ -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
+4 -3
View File
@@ -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();