From fb4b981beefa70e896018780656b749b8bfd21f7 Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Fri, 31 Mar 2023 14:33:24 +0200
Subject: [PATCH 1/2] Revert "Support async connect"

This reverts commit 34a0b8370efc860190518ee5ff1ab9f23af7cdbe.
---
 src/IptvSimple.cpp                | 10 +---------
 src/iptvsimple/PlaylistLoader.cpp |  6 +-----
 src/iptvsimple/PlaylistLoader.h   |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/IptvSimple.cpp b/src/IptvSimple.cpp
index 86fe3f06b..c19c0a503 100644
--- a/src/IptvSimple.cpp
+++ b/src/IptvSimple.cpp
@@ -35,8 +35,6 @@ bool IptvSimple::Initialise()
 {
   std::lock_guard<std::mutex> lock(m_mutex);
 
-  ConnectionStateChange("", PVR_CONNECTION_STATE_CONNECTING, "");
-
   m_channels.Init();
   m_channelGroups.Init();
   m_providers.Init();
@@ -45,11 +43,6 @@ bool IptvSimple::Initialise()
   {
     m_channels.ChannelsLoadFailed();
     m_channelGroups.ChannelGroupsLoadFailed();
-    ConnectionStateChange("", PVR_CONNECTION_STATE_DISCONNECTED, "");
-  }
-  else
-  {
-    ConnectionStateChange("", PVR_CONNECTION_STATE_CONNECTED, "");
   }
   m_epg.Init(EpgMaxPastDays(), EpgMaxFutureDays());
 
@@ -123,8 +116,7 @@ void IptvSimple::Process()
       std::this_thread::sleep_for(std::chrono::milliseconds(1000));
 
       m_settings->ReloadAddonInstanceSettings();
-      if (m_playlistLoader.ReloadPlayList())
-        ConnectionStateChange("", PVR_CONNECTION_STATE_CONNECTED, "");
+      m_playlistLoader.ReloadPlayList();
       m_epg.ReloadEPG(); // Reloading EPG also updates media
 
       m_reloadChannelsGroupsAndEPG = false;
diff --git a/src/iptvsimple/PlaylistLoader.cpp b/src/iptvsimple/PlaylistLoader.cpp
index ccf29d746..75e32a712 100644
--- a/src/iptvsimple/PlaylistLoader.cpp
+++ b/src/iptvsimple/PlaylistLoader.cpp
@@ -517,7 +517,7 @@ void PlaylistLoader::ParseSinglePropertyIntoChannel(const std::string& line, Cha
   }
 }
 
-bool PlaylistLoader::ReloadPlayList()
+void PlaylistLoader::ReloadPlayList()
 {
   m_m3uLocation = m_settings->GetM3ULocation();
 
@@ -532,15 +532,11 @@ bool PlaylistLoader::ReloadPlayList()
     m_client->TriggerChannelGroupsUpdate();
     m_client->TriggerProvidersUpdate();
     m_client->TriggerRecordingUpdate();
-
-    return true;
   }
   else
   {
     m_channels.ChannelsLoadFailed();
     m_channelGroups.ChannelGroupsLoadFailed();
-
-    return false;
   }
 }
 
diff --git a/src/iptvsimple/PlaylistLoader.h b/src/iptvsimple/PlaylistLoader.h
index 8d2009f96..593c93ef8 100644
--- a/src/iptvsimple/PlaylistLoader.h
+++ b/src/iptvsimple/PlaylistLoader.h
@@ -71,7 +71,7 @@ namespace iptvsimple
     bool Init();
 
     bool LoadPlayList();
-    bool ReloadPlayList();
+    void ReloadPlayList();
 
   private:
     static std::string ReadMarkerValue(const std::string& line, const std::string& markerName);

From cb4c37f25756de7724f6dcf3ae36d8ac791e257a Mon Sep 17 00:00:00 2001
From: phunkyfish <phunkyfish@gmail.com>
Date: Fri, 31 Mar 2023 14:38:14 +0200
Subject: [PATCH 2/2] Test version 2.9.2

---
 pvr.iptvsimple/addon.xml.in  | 2 +-
 pvr.iptvsimple/changelog.txt | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
index d6088165f..08d92f2fc 100644
--- a/pvr.iptvsimple/addon.xml.in
+++ b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="20.9.1"
+  version="20.9.2"
   name="IPTV Simple Client"
   provider-name="nightik and Ross Nicholson">
   <requires>@ADDON_DEPENDS@
diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
index 59003d94f..3890e5db2 100644
--- a/pvr.iptvsimple/changelog.txt
+++ b/pvr.iptvsimple/changelog.txt
@@ -1,4 +1,7 @@
-v20.9.1
+v20.9.2
+- Revert async connect support
+
+v20.9.2
 - Don't URL encode paths using resource:// or special:// protocols
 
 v20.9.0