]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
SAT>IP server: fix init bug introduced by last commits
authorJaroslav Kysela <perex@perex.cz>
Mon, 30 Nov 2015 17:12:46 +0000 (18:12 +0100)
committerJaroslav Kysela <perex@perex.cz>
Mon, 30 Nov 2015 17:12:46 +0000 (18:12 +0100)
src/satip/rtsp.c

index ba1cf67019ff290f27227e1d27961ece449ac794..1196d09ee9b723202ff2dd7f1b63d23a7365bc8d 100644 (file)
@@ -1603,15 +1603,15 @@ void satip_server_rtsp_init
     rtsp_server = NULL;
     reg = 1;
   }
-  if ((s = rtsp_ip) != NULL)
-    rtsp_ip = strdup(bindaddr);
+  s = rtsp_ip;
+  rtsp_ip = strdup(bindaddr);
   free(s);
   rtsp_port = port;
   rtsp_descramble = descramble;
   rtsp_rewrite_pmt = rewrite_pmt;
   rtsp_muxcnf = muxcnf;
-  if ((s = rtsp_nat_ip) != NULL)
-    rtsp_nat_ip = nat_ip ? strdup(nat_ip) : NULL;
+  s = rtsp_nat_ip;
+  rtsp_nat_ip = nat_ip ? strdup(nat_ip) : NULL;
   free(s);
   if (!rtsp_server)
     rtsp_server = tcp_server_create("satips", "SAT>IP RTSP", bindaddr, port, &ops, NULL);