From 05caa7e3ae82c3e909cb70b4511263eb8c77cc1a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 13 Feb 2023 22:00:02 +0100 Subject: [PATCH] zapit/bouquets: rework group-prefix handling Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/cb3655189c61fbd7377e26cfc5b57c91f5286054 Author: vanhofen Date: 2023-02-13 (Mon, 13 Feb 2023) Origin message was: ------------------ - zapit/bouquets: rework group-prefix handling --- src/zapit/src/bouquets.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 429337a62..e5328e735 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -1095,8 +1095,14 @@ void CBouquetManager::loadWebchannels(int mode) { std::string bname = prefix; if (bname.compare("") == 0) + { bname = (mode == MODE_WEBTV) ? "WebTV" : "WebRadio"; - bname += ": " + group; + bname += ": " + group; + } + else if (bname.compare("none") == 0) + bname = group; + else + bname += " " + group; gbouquet = addBouquetIfNotExist(bname); if (mode == MODE_WEBTV) gbouquet->bWebtv = true; @@ -1212,8 +1218,7 @@ void CBouquetManager::loadWebchannels(int mode) CZapitBouquet* gbouquet = pbouquet; if (!group.empty()) { - std::string bname; - bname = (mode == MODE_WEBTV) ? "WebTV" : "WebRadio"; + std::string bname = (mode == MODE_WEBTV) ? "WebTV" : "WebRadio"; bname += ": " + group; gbouquet = addBouquetIfNotExist(bname); if (mode == MODE_WEBTV)