From deff33d2664694fa33e2a8f1b88b7ac5c66142d4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 7 Oct 2024 20:24:49 +0200 Subject: [PATCH] unify text-replacements in EPG Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/49d2cb3abfb64ae90bfb5f6abd8ea87ea81df12b Author: vanhofen Date: 2024-10-07 (Mon, 07 Oct 2024) Origin message was: ------------------ - unify text-replacements in EPG ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/eitd/SIevents.cpp | 1 + src/gui/epgplus.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp index d4f994c32..b58c00dcc 100644 --- a/src/eitd/SIevents.cpp +++ b/src/eitd/SIevents.cpp @@ -517,6 +517,7 @@ void SIevent::setName(const std::string &lang, const std::string &name) void SIevent::setName(unsigned int lang, const std::string &name) { std::string tmp = name; + std::replace(tmp.begin(), tmp.end(), '\\n', ' '); std::replace(tmp.begin(), tmp.end(), '\n', ' '); std::replace(tmp.begin(), tmp.end(), '\t', ' '); diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 9aeef20c1..670273b29 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -390,8 +390,8 @@ void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor) std::string shortepg = shortEpgData.info1; if(!shortepg.empty()) { - shortepg = str_replace("\n", " ", shortepg); shortepg = str_replace("\\n", " ", shortepg); + shortepg = str_replace("\n", " ", shortepg); shortepg = str_replace("\t", " ", shortepg); } this->footer->paintEventDetails(this->channelEvent.description, ret ? shortepg : "");