From 6c8f30d5835c20c93d7d7fe11c0c5e5d8c0e3f9e Mon Sep 17 00:00:00 2001
From: doskabouter <paul.doskabouter@gmail.com>
Date: Sat, 22 Feb 2025 15:13:12 +0100
Subject: [PATCH 1/2] Fixed MP1-5236: Improved support for m3u8 files

---
 TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs b/TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs
index 1778e4c2333..2c040f62f29 100644
--- a/TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs
+++ b/TvEngine3/TVLibrary/SetupTv/PlaylistSupport/PlayListM3uIO.cs
@@ -57,7 +57,7 @@ public bool Load(PlayList incomingPlaylist, string playlistFileName)
 
           string trimmedLine = line.Trim();
 
-          if (trimmedLine != M3U_START_MARKER)
+          if (!trimmedLine.StartsWith(M3U_START_MARKER))
           {
             string fileName = trimmedLine;
             if (!AddItem("", 0, fileName))
@@ -154,7 +154,7 @@ public void Save(PlayList playListParam, string fileName)
           }
         }
       }
-      catch (Exception) {}
+      catch (Exception) { }
     }
   }
 }
\ No newline at end of file

From c1ec37add6bb577e3dbe2a199a11eacc51e0c600 Mon Sep 17 00:00:00 2001
From: doskabouter <paul.doskabouter@gmail.com>
Date: Sun, 23 Feb 2025 14:31:02 +0100
Subject: [PATCH 2/2] - Added comment to RadioWebStreamInfo - Fixed exception
 in GetAvailableCardsForChannel when using RadioWebStreamInfo

---
 TvEngine3/TVLibrary/SetupTv/SettingsForm.cs                  | 2 +-
 .../CardManagement/CardAllocation/AdvancedCardAllocation.cs  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/TvEngine3/TVLibrary/SetupTv/SettingsForm.cs b/TvEngine3/TVLibrary/SetupTv/SettingsForm.cs
index edce514aa99..eab078215e8 100644
--- a/TvEngine3/TVLibrary/SetupTv/SettingsForm.cs
+++ b/TvEngine3/TVLibrary/SetupTv/SettingsForm.cs
@@ -282,7 +282,7 @@ private void AddServerTvCards(Servers servers, IList<Server> dbsServers, bool re
                 cardName = String.Format("{0} {1}", cardId, cardName);
                 InfoPage RadioWebStreamInfo = new InfoPage(cardName);
                 RadioWebStreamInfo.InfoText =
-                  "The RadioWebStream card does not have any options.\n\n\nYou can add your favourite radio webstreams under:\n\n --> 'Radio Channels', 'Add', 'Web-Stream' or by importing a playlist.";
+                  "The RadioWebStream card does not have any options.\n\nNote that this card doesn't support recording or previewing\n\nYou can add your favourite radio webstreams under:\n\n --> 'Radio Channels', 'Add', 'Web-Stream' or by importing a playlist.";
                 AddChildSection(cardPage, RadioWebStreamInfo, 1);
                 break;
               case CardType.Unknown:
diff --git a/TvEngine3/TVLibrary/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs b/TvEngine3/TVLibrary/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs
index 8fa08da3ea8..0ddfa93ca8e 100644
--- a/TvEngine3/TVLibrary/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs
+++ b/TvEngine3/TVLibrary/TvService/CardManagement/CardAllocation/AdvancedCardAllocation.cs
@@ -259,6 +259,11 @@ public List<CardDetail> GetAvailableCardsForChannel(IDictionary<int, ITvCardHand
 
         foreach (IChannel tuningDetail in tuningDetails)
         {
+          if (tuningDetail == null)
+          {
+            Log.Error("GetAvailableCardsForChannel:   channel #{0} tuningdetails = null", number);
+            continue;
+          }
           cardsUnAvailable.Clear();
           number++;
           if (LogEnabled)