From d4d6f634d2cfcee58801795f16a4271859cdf592 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 2 Jun 2024 14:14:58 +0200 Subject: [PATCH] fix reload webchannels Origin commit data ------------------ Commit: https://github.com/TangoCash/neutrino-tangos/commit/f19cf3a8fb56e42e4762e2cfdf3d2ed65b3c55e1 Author: TangoCash Date: 2024-06-02 (Sun, 02 Jun 2024) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit # Conflicts: # src/gui/webchannels_setup.cpp --- src/gui/webchannels_setup.cpp | 4 ++++ src/zapit/include/zapit/zapit.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp index 23aa266fa..c21b51e88 100644 --- a/src/gui/webchannels_setup.cpp +++ b/src/gui/webchannels_setup.cpp @@ -304,6 +304,10 @@ int CWebChannelsSetup::Show() g_settings.webtv_xml = webchannels; } webchannels_auto(); + if (webradio) + CZapit::getInstance()->SetWebRadioXML(&g_settings.webradio_xml); + else + CZapit::getInstance()->SetWebTVXML(&g_settings.webtv_xml); g_Zapit->reinitChannels(); CNeutrinoApp::getInstance()->xmltv_xml_auto_readepg(); changed = false; diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 90bf50755..581e51855 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -304,6 +304,8 @@ class CZapit : public OpenThreads::Thread void Rezap(); std::list *GetWebTVXML(void) { return webtv_xml; } std::list *GetWebRadioXML(void) { return webradio_xml; } + void SetWebTVXML(std::list *xml) { webtv_xml = xml; } + void SetWebRadioXML(std::list *xml) { webradio_xml = xml; } bool getUseChannelFilter(); void setMoviePlayer(bool enable); };