From 02a842f95a09a74d7eba90648c97693638007141 Mon Sep 17 00:00:00 2001
From: Martin <martin.dummer@gmx.net>
Date: Thu, 5 Jan 2023 14:43:33 +0100
Subject: [PATCH] More fixes from Firefly (#84)

* fix missing retune resulting in black screen

(cherry picked from commit 0f20f764bce549f7866ab19a91d0850397de21ea)

* avoid empty and therefore useless requests to SATIP server

(cherry picked from commit 275afb68bc6a8a7fdc91600c8869815008c94d6d)

Co-authored-by: FireFly <christoph1.haubrich@arcor.de>
---
 tuner.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tuner.c b/tuner.c
index c6670bb..b5af331 100644
--- a/tuner.c
+++ b/tuner.c
@@ -244,6 +244,7 @@ bool cSatipTuner::Connect(void)
         if (useTcp)
            debug1("%s Requesting TCP [device %d]", __PRETTY_FUNCTION__, deviceIdM);
         if (rtspM.Setup(*uri, rtpM.Port(), rtcpM.Port(), useTcp)) {
+           lastParamM = streamParamM;
            keepAliveM.Set(timeoutM);
            if (nextServerM.IsValid()) {
               currentServerM = nextServerM;
@@ -552,9 +553,11 @@ bool cSatipTuner::UpdatePids(bool forceP)
            tnrParamM = param;
            }
         }
-     pidUpdateCacheM.Set(ePidUpdateIntervalMs);
-     if (!rtspM.Play(*uri))
-        return false;
+     if (paramadded) {
+        pidUpdateCacheM.Set(ePidUpdateIntervalMs);
+        if (!rtspM.Play(*uri))
+           return false;
+        }
      addPidsM.Clear();
      delPidsM.Clear();
      }