Merge branch 'release-0.4.1' of github.com:Vocaluxe/Vocaluxe into develop

This commit is contained in:
Florian Küpper committed 2017-11-09 15:27:22 +01:00
commit 15abc916e5
1 file changed
+17 -3
+17 -3
View File
@@ -53,6 +53,10 @@ namespace Vocaluxe.Base
{ {
_VideoTimer.Reset(); _VideoTimer.Reset();
_Finished = false; _Finished = false;
if (_VideoStream == null)
{
return;
}
//CVideo.VdSkip(_VideoStream, 0f, 0f); //CVideo.VdSkip(_VideoStream, 0f, 0f);
_VideoTimer.Start(); _VideoTimer.Start();
CVideo.Resume(_VideoStream); CVideo.Resume(_VideoStream);
@@ -60,12 +64,19 @@ namespace Vocaluxe.Base
public void Pause() public void Pause()
{ {
CVideo.Pause(_VideoStream); if (_VideoStream != null)
{
CVideo.Pause(_VideoStream);
}
_VideoTimer.Stop(); _VideoTimer.Stop();
} }
public void Resume() public void Resume()
{ {
if (_VideoStream == null)
{
return;
}
CVideo.Resume(_VideoStream); CVideo.Resume(_VideoStream);
_VideoTimer.Start(); _VideoTimer.Start();
} }
@@ -92,7 +103,7 @@ namespace Vocaluxe.Base
public void PreLoad() public void PreLoad()
{ {
if (!_Loaded) if (!_Loaded || _VideoStream == null)
{ {
return; return;
} }
@@ -111,7 +122,10 @@ namespace Vocaluxe.Base
public void Close() public void Close()
{ {
CVideo.Close(ref _VideoStream); if (_VideoStream != null)
{
CVideo.Close(ref _VideoStream);
}
_Loaded = false; _Loaded = false;
_Finished = false; _Finished = false;
_VideoTimer.Reset(); _VideoTimer.Reset();