Fix merge error.

This commit is contained in:
Florian Küpper committed 2013-09-15 15:26:25 +02:00
1 parent 0400a02bc1
commit 808c52d471
1 file changed
+3
@@ -453,6 +453,8 @@ namespace VocaluxeLib.Menu.SongMenu
float vtime; float vtime;
if (CBase.Video.GetFrame(_Video, ref _Vidtex, time, out vtime)) if (CBase.Video.GetFrame(_Video, ref _Vidtex, time, out vtime))
{
if (_Vidtex != null)
{ {
if (_VideoFadeTimer.ElapsedMilliseconds <= 3000L) if (_VideoFadeTimer.ElapsedMilliseconds <= 3000L)
_Vidtex.Color.A = _VideoFadeTimer.ElapsedMilliseconds / 3000f; _Vidtex.Color.A = _VideoFadeTimer.ElapsedMilliseconds / 3000f;
@@ -463,6 +465,7 @@ namespace VocaluxeLib.Menu.SongMenu
} }
} }
} }
}
public virtual void OnShow() public virtual void OnShow()
{ {