Merge branch 'release-0.3' into develop
Conflicts: Vocaluxe/Base/CConfig.cs Vocaluxe/Lib/Playlist/CPlaylistFile.cs Vocaluxe/Screens/CScreenSong.cs VocaluxeLib/CHelper.cs VocaluxeLib/Menu/CMenu.cs VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
This commit is contained in:
commit
73e4a9fa74
15 files changed
+240
-272
No files matched your search
@@ -140,6 +140,8 @@ namespace VocaluxeLib
|
||||
{
|
||||
var files = new List<string>();
|
||||
var dir = new DirectoryInfo(path);
|
||||
if (!dir.Exists)
|
||||
return files;
|
||||
|
||||
try
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user