allow external .sub subtitles next to text-based ones
authorVoyager1 <voyager@xbmc.org>
Fri, 27 Sep 2013 16:39:31 +0000 (18:39 +0200)
committerVoyager1 <voyager@xbmc.org>
Fri, 27 Sep 2013 18:19:27 +0000 (20:19 +0200)
xbmc/cores/dvdplayer/DVDPlayer.cpp

index 0c0bf23..0cd222a 100644 (file)
@@ -3729,7 +3729,7 @@ bool CDVDPlayer::GetCurrentSubtitle(CStdString& strSubtitle)
 {
   double pts = m_clock.GetClock() + m_State.time_offset;
 
-  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) && m_CurrentSubtitle.source != STREAM_SOURCE_TEXT)
+  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) && m_CurrentSubtitle.source != STREAM_SOURCE_TEXT && m_CurrentSubtitle.source != STREAM_SOURCE_DEMUX_SUB)
     return false;
 
   m_dvdPlayerSubtitle.GetCurrentSubtitle(strSubtitle, pts - m_dvdPlayerVideo.GetSubtitleDelay());