Fixed wrong song folder path that leads to not working folder-sorting

This commit is contained in:
Florian Küpper committed 2017-11-16 12:26:38 +01:00
1 parent ceaa77ffe7
commit 06d6be528a
1 file changed
+28 -11
+28 -11
View File
@@ -191,13 +191,14 @@ namespace Vocaluxe.Base
public static event OnSongMenuChanged SongMenuChanged;
//Folders
//We need full path for folders for matching folder path with textfile path when loading
public static readonly List<string> SongFolders = new List<string>
{
#if INSTALLER
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs),
CSettings.FolderNameSongs
Path.Combine(CSettings.ProgramFolder, FolderNameSongs)
#elif WIN
CSettings.FolderNameSongs
Path.Combine(CSettings.ProgramFolder, CSettings.FolderNameSongs)
#elif LINUX
Path.Combine(CSettings.DataFolder, CSettings.FolderNameSongs)
#endif
@@ -335,15 +336,8 @@ namespace Vocaluxe.Base
else
Config = xml.DeserializeString<SConfig>("<root />");
if (Config.Game.SongFolder.Length > 0 && Config.Game.SongFolder[0] != "")
{
SongFolders.Clear();
SongFolders.AddRange(Config.Game.SongFolder);
}
else
{
Config.Game.SongFolder = SongFolders.ToArray();
}
NormalizeSongPaths();
if ((Config.Game.ScoreAnimationTime > 0 && Config.Game.ScoreAnimationTime < 1) || Config.Game.ScoreAnimationTime < 0)
Config.Game.ScoreAnimationTime = 1;
@@ -625,6 +619,29 @@ namespace Vocaluxe.Base
return false;
}
/// <summary>
/// Set song path if none is find in config and check if every path exists
/// </summary>
public static void NormalizeSongPaths()
{
//Check if there are configured songfolders
if (Config.Game.SongFolder.Length > 0 && Config.Game.SongFolder[0] != "")
{
SongFolders.Clear();
foreach (string folder in Config.Game.SongFolder)
{
//Check if folder exists
if (Directory.Exists(folder))
SongFolders.Add(folder);
}
}
//Test if songfolders are still empty or now empty
if(Config.Game.SongFolder.Length == 0)
Config.Game.SongFolder = SongFolders.ToArray();
}
/// <summary>
/// Load command-line-parameters and their values to lists.
/// </summary>