[vlc-commits] mkv: wait for the next Demux() call if we entered a new Chapter

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Thu Mar 17 12:16:11 2016 +0100| [06f449ef1bd2a05b1ab1241cb02ec4b2ac5bc7cb] | committer: Jean-Baptiste Kempf

mkv: wait for the next Demux() call if we entered a new Chapter

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06f449ef1bd2a05b1ab1241cb02ec4b2ac5bc7cb
---

 modules/demux/mkv/virtual_segment.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index 44f21b6..12732fc 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -427,8 +427,9 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux )
 
     if ( !b_current_vchapter_entered && p_current_vchapter != NULL )
     {
-        p_current_vchapter->Enter( true );
         b_current_vchapter_entered = true;
+        if (p_current_vchapter->Enter( true ))
+            return true;
     }
 
     if ( sys.i_pts != VLC_TS_INVALID )