Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Prevent possible crash when disposing vlc - thx Bengt :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2019-01-18 15:12:06 +01:00
parent ccadde1906
commit 768bb8f69a
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Logic/VideoPlayers/LibVlcDynamic.cs
View File

@ -764,10 +764,19 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
private void VideoEndTimerTick(object sender, EventArgs e)
{
lock (DisposeLock)
{
if (_mediaPlayer == IntPtr.Zero)
{
return;
}
const int ended = 6;
int state = _libvlc_media_player_get_state(_mediaPlayer);
if (state != ended)
{
return;
}
// hack to make sure VLC is in ready state
Stop();
@ -775,6 +784,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
Pause();
OnVideoEnded?.Invoke(_mediaPlayer, new EventArgs());
}
}
public override void DisposeVideoPlayer()
{
@ -838,11 +848,13 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
{
if (_videoLoadedTimer != null)
{
_videoLoadedTimer.Stop();
_videoLoadedTimer.Dispose();
_videoLoadedTimer = null;
}
if (_videoEndTimer != null)
{
_videoEndTimer.Stop();
_videoEndTimer.Dispose();
_videoEndTimer = null;
}
@ -851,6 +863,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
_mouseTimer.Dispose();
_mouseTimer = null;
}
Application.DoEvents();
}
ReleaseUnmangedResources();
}