Merge branch '1.0-bugfix'

Conflicts:

	src/input/input.c

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index 2cd9a7f212febbfd11973d74f23d03c2afe963eb..88d49624b89f64015f220b89adee23cfa1458083 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -348,11 +348,10 @@ static void SyslogPrint( const msg_item_t *p_msg )
     int i_priority = i_prio[p_msg->i_type];
 
     if( p_msg->psz_header )
-        syslog( i_priority, "%s%s %s: %s", p_msg->psz_header,
-                ppsz_type[p_msg->i_type],
-                p_msg->psz_module, p_msg->psz_msg );
+        syslog( i_priority, "%s %s%s%s", p_msg->psz_header, p_msg->psz_module,
+                ppsz_type[p_msg->i_type], p_msg->psz_msg );
     else
-        syslog( i_priority, "%s%s: %s", p_msg->psz_module, 
+        syslog( i_priority, "%s%s%s", p_msg->psz_module, 
                 ppsz_type[p_msg->i_type], p_msg->psz_msg );
  
 }

diff --git a/src/input/input.c b/src/input/input.c
index 1fa7b611bc0a026249abb40ce4a639fdfe035f08..5723b74d1730022be9e8eacf6855ca72a32106f1 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1138,7 +1138,6 @@ static void InitPrograms( input_thread_t * p_input )
     {
         demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
                         val.p_list );
-        var_FreeList( &val, NULL );
     }
     else
     {