From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 30 Nov 2015 17:12:46 +0000 (+0100)
Subject: SAT>IP server: fix init bug introduced by last commits
X-Git-Tag: v4.2.1~1440
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf3c7f0cd337a5fbe701f07d0908d60e08b7993e;p=thirdparty%2Ftvheadend.git

SAT>IP server: fix init bug introduced by last commits
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index ba1cf6701..1196d09ee 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -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);