Fix forgetting last song after singing.

This commit is contained in:
Florian Küpper committed 2013-12-31 15:41:28 +01:00
1 parent 388a5b4078
commit 5277504e34
2 files changed
+14 -6

No files matched your search

@@ -116,7 +116,7 @@ namespace VocaluxeLib.Menu.SongMenu
//the real selected song for singing
protected int _Locked { get; set; }
private int _PreviewIdInternal = -1;
protected int _PreviewIdInternal = -1;
protected virtual int _PreviewId
{
get { return _PreviewIdInternal; }
@@ -523,7 +523,7 @@ namespace VocaluxeLib.Menu.SongMenu
CBase.Songs.SetCategory(-1);
}
private void _PlaySong(int nr)
protected void _PlaySong(int nr)
{
if (CBase.Songs.IsInCategory() && (_PreviewId != nr || _Streams.Count == 0))
{
@@ -555,6 +555,8 @@ namespace VocaluxeLib.Menu.SongMenu
_Streams.Add(stream);
_PreviewSongStream = stream;
_PreviewIdInternal = nr;
if (song.VideoFileName != "" && CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
{
_PreviewVideoStream = CBase.Video.Load(Path.Combine(song.Folder, song.VideoFileName));