From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 28 Apr 2016 07:35:57 +0000 (+0200)
Subject: SAT>IP server: try to recover correctly for multiple PLAY commands, fixes #3750
X-Git-Tag: v4.2.1~600
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53745738ad52d593593140febae4090d823bb3c1;p=thirdparty%2Ftvheadend.git

SAT>IP server: try to recover correctly for multiple PLAY commands, fixes #3750
---

diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index fc2d4d45f..07cc2c606 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -967,7 +967,8 @@ rtsp_parse_cmd
     }
     *oldstate = rs->state;
     dmc = &rs->dmc;
-    if (rs->mux == NULL) goto end;
+    if (rs->mux == NULL)
+      *oldstate = rs->state = STATE_SETUP;
     if (!fe) {
       fe = rs->frontend;
       findex = rs->findex;
@@ -1346,7 +1347,7 @@ static int
 rtsp_process_play(http_connection_t *hc, int setup)
 {
   session_t *rs;
-  int errcode = HTTP_STATUS_BAD_REQUEST, valid = 0, oldstate = 0, i, stream;;
+  int errcode = HTTP_STATUS_BAD_REQUEST, valid = 0, oldstate = 0, i, stream;
   char buf[256], *u = tvh_strdupa(hc->hc_url);
   http_arg_list_t args;