Fixed crash with faulty song files
This commit is contained in:
1 parent
71251b8733
commit
55849376ba
1 file changed
+14
-8
@@ -230,9 +230,7 @@ namespace VocaluxeLib.Menu.SongMenu
|
||||
public static CSong LoadSong(string filePath)
|
||||
{
|
||||
CSong song = new CSong();
|
||||
if (song.ReadHeader(filePath))
|
||||
return song;
|
||||
return null;
|
||||
return song.ReadHeader(filePath) ? song : null;
|
||||
}
|
||||
|
||||
public CSong(CSong song)
|
||||
@@ -785,11 +783,19 @@ namespace VocaluxeLib.Menu.SongMenu
|
||||
return false;
|
||||
}
|
||||
sr.Dispose();
|
||||
_FindRefrain();
|
||||
_FindShortEnd();
|
||||
_NotesLoaded = true;
|
||||
if (IsDuet)
|
||||
_CheckDuet();
|
||||
try
|
||||
{
|
||||
_FindRefrain();
|
||||
_FindShortEnd();
|
||||
_NotesLoaded = true;
|
||||
if (IsDuet)
|
||||
_CheckDuet();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
CBase.Log.LogError("Error loading song. An unhandled exception occured (" + e.Message + "): " + filePath);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user