From 808c52d471996f496584c56998611b86c881b039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Sun, 15 Sep 2013 15:26:25 +0200 Subject: [PATCH] Fix merge error. --- VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs index f637bc1f..ea5c4928 100644 --- a/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs +++ b/VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs @@ -454,12 +454,15 @@ namespace VocaluxeLib.Menu.SongMenu float vtime; if (CBase.Video.GetFrame(_Video, ref _Vidtex, time, out vtime)) { - if (_VideoFadeTimer.ElapsedMilliseconds <= 3000L) - _Vidtex.Color.A = _VideoFadeTimer.ElapsedMilliseconds / 3000f; - else + if (_Vidtex != null) { - _Vidtex.Color.A = 1f; - _VideoFadeTimer.Stop(); + if (_VideoFadeTimer.ElapsedMilliseconds <= 3000L) + _Vidtex.Color.A = _VideoFadeTimer.ElapsedMilliseconds / 3000f; + else + { + _Vidtex.Color.A = 1f; + _VideoFadeTimer.Stop(); + } } } }