QT4: leave assert there

[vlc] / modules / control / netsync.c

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 76a5a238d3cc2441a517e695ab8a68638b654eb6..118255e3c71f2dcf8a14af876aff4fc04bd04c1d 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -37,12 +37,7 @@
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#endif
+#include <sys/types.h>
 #ifdef HAVE_POLL
 #   include <poll.h>
 #endif
@@ -100,9 +95,9 @@ static int Activate( vlc_object_t *p_this )
     intf_thread_t *p_intf = (intf_thread_t*)p_this;
     int fd;
 
-    if( config_GetInt( p_intf, "netsync-master" ) <= 0 )
+    if( !var_InheritInteger( p_intf, "netsync-master" ) )
     {
-        char *psz_master = config_GetPsz( p_intf, "netsync-master-ip" );
+        char *psz_master = var_InheritString( p_intf, "netsync-master-ip" );
         if( psz_master == NULL )
         {
             msg_Err( p_intf, "master address not specified" );