[vlc-commits] demux: ts: simplify the current epg

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Mar  3 18:05:37 2016 +0100| [3914f396bd7213f462b6fe4ba8be461fa6e729ae] | committer: Francois Cartegnie

demux: ts: simplify the current epg

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

 modules/demux/mpeg/ts_psi_eit.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts_psi_eit.c b/modules/demux/mpeg/ts_psi_eit.c
index 4829cc6..dfa6c95 100644
--- a/modules/demux/mpeg/ts_psi_eit.c
+++ b/modules/demux/mpeg/ts_psi_eit.c
@@ -474,12 +474,14 @@ static void EITCallBack( demux_t *p_demux,
 
         /* */
         if( i_start > 0 && psz_name && psz_text)
+        {
             vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text,
                               *psz_extra ? psz_extra : NULL, i_min_age );
 
-        /* Update "now playing" field */
-        if( p_evt->i_running_status == TS_SI_RUNSTATUS_RUNNING && i_start > 0  && psz_name && psz_text )
-            vlc_epg_SetCurrent( p_epg, i_start );
+            /* Update "now playing" field */
+            if( p_evt->i_running_status == TS_SI_RUNSTATUS_RUNNING )
+                vlc_epg_SetCurrent( p_epg, i_start );
+        }
 
         free( psz_name );
         free( psz_text );