[vlc-commits] es_out: epg: do not clear nowplaying on every merge

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Feb 27 12:26:24 2016 +0100| [25432f56dcb2783d529831af4ad1b71a928ae922] | committer: Francois Cartegnie

es_out: epg: do not clear nowplaying on every merge

Split eit table updates should not clear
previous current/nowplaying status sent
from another table update.

Fixes the missing or dissapearing nowplaying
with ts programs.

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

 src/input/es_out.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 72dbbde..ad7dcd6 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1290,8 +1290,11 @@ static void EsOutProgramEpg( es_out_t *out, int i_group, const vlc_epg_t *p_epg
     input_SendEventMetaEpg( p_sys->p_input );
 
     /* Update now playing */
-    free( p_pgrm->psz_now_playing );
-    p_pgrm->psz_now_playing = NULL;
+    if( p_epg->p_current || p_epg->i_event == 0 )
+    {
+        free( p_pgrm->psz_now_playing );
+        p_pgrm->psz_now_playing = NULL;
+    }
 
     vlc_mutex_lock( &p_item->lock );
     for( int i = 0; i < p_item->i_epg; i++ )