[rbp/omxplayer] Take advantage of if evaluation order.
authorpopcornmix <popcornmix@gmail.com>
Sun, 3 Nov 2013 14:36:36 +0000 (14:36 +0000)
committerpopcornmix <popcornmix@gmail.com>
Sun, 3 Nov 2013 16:20:43 +0000 (16:20 +0000)
xbmc/cores/omxplayer/OMXPlayer.cpp

index 3cccef1..1199146 100644 (file)
@@ -811,7 +811,7 @@ bool COMXPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)
 {
 
   // check if we should read from subtitle demuxer
-  if(m_dvdPlayerSubtitle.AcceptsData() &&  m_pSubtitleDemuxer)
+  if( m_pSubtitleDemuxer && m_dvdPlayerSubtitle.AcceptsData() )
   {
     if(m_pSubtitleDemuxer)
       packet = m_pSubtitleDemuxer->Read();