[vlc-commits] timeshift: ES_OUT_RESTART_ES with NULL is a valid value

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Fri Apr 22 17:56:42 2016 +0200| [3a021a48c693ae5315996fb18b65d8a45da4a1a3] | committer: Jean-Baptiste Kempf

timeshift: ES_OUT_RESTART_ES with NULL is a valid value

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

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

 src/input/es_out_timeshift.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index d1a1fc5..4420cfc 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -1553,7 +1553,8 @@ static int CmdExecuteControl( es_out_t *p_out, ts_cmd_t *p_cmd )
     case ES_OUT_SET_ES:      /* arg1= es_out_id_t*                   */
     case ES_OUT_RESTART_ES:  /* arg1= es_out_id_t*                   */
     case ES_OUT_SET_ES_DEFAULT: /* arg1= es_out_id_t*                */
-        return es_out_Control( p_out, i_query, p_cmd->u.control.u.p_es->p_es );
+        return es_out_Control( p_out, i_query, !p_cmd->u.control.u.p_es ? NULL :
+                                               p_cmd->u.control.u.p_es->p_es );
 
     case ES_OUT_SET_ES_STATE:/* arg1= es_out_id_t* arg2=bool   */
         return es_out_Control( p_out, i_query, p_cmd->u.control.u.es_bool.p_es->p_es,