MP1-5224: TvServer: TvLibrary: Fix CancelTune request (remains perman…

…ently set)
MediaPortal · Jul 30, 2024 · 02ef5a7 · 02ef5a7
1 parent 58c9558
commit 02ef5a7
Showing 1 changed file with 29 additions and 25 deletions.
diff --git a/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs b/TvEngine3/TVLibrary/TVLibrary/Implementations/DVB/Graphs/TvCardDvbBase.cs
@@ -319,41 +319,44 @@ public virtual ITvSubChannel Tune(int subChannelId, IChannel channel)
     }
 
     private ITvSubChannel DoTune(int subChannelId, IChannel channel, bool ignorePMT)
-    {      
-      bool performTune = (_previousChannel == null || _previousChannel.IsDifferentTransponder(channel));
-      ITvSubChannel ch = SubmitTuneRequest(subChannelId, channel, _tuneRequest, performTune);
-      _previousChannel = channel;
-
+    {
       try
       {
-        if (ch != null)
+        bool performTune = (_previousChannel == null || _previousChannel.IsDifferentTransponder(channel));
+        ITvSubChannel ch = SubmitTuneRequest(subChannelId, channel, _tuneRequest, performTune);
+        _previousChannel = channel;
+
+        try
         {
-          try
+          if (ch != null)
           {
-            RunGraph(ch.SubChannelId);
-          }
-          catch (TvExceptionNoPMT)
-          {
-            if (!ignorePMT)
+            try
+            {
+              RunGraph(ch.SubChannelId);
+            }
+            catch (TvExceptionNoPMT)
             {
-              throw;
+              if (!ignorePMT)
+              {
+                throw;
+              }
             }
+            OnAfterTune(channel);
+            return ch;
+          }
+          else
+          {
+            throw new TvException("TvCardDvbBase.Tune: Subchannel was null");
           }
-          OnAfterTune(channel);
-          return ch;
-        }
-        else
-        {
-          throw new TvException("TvCardDvbBase.Tune: Subchannel was null");
         }
-      }
-      catch (Exception)
-      {
-        if (ch != null)
+        catch (Exception)
         {
-          FreeSubChannel(ch.SubChannelId);
+          if (ch != null)
+          {
+            FreeSubChannel(ch.SubChannelId);
+          }
+          throw;
         }
-        throw;
       }
       finally
       {
@@ -953,6 +956,7 @@ public override void StopGraph()
       _epgGrabbing = false;
       _isScanning = false;
       FreeAllSubChannels();
+      _cancelTune = false;
       if (_mdplugs != null)
       {
         _mdplugs.FreeAllChannels();