From 2068925288a53edf937e213b75cf96d475c34d25 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 9 Sep 2018 13:06:05 +0200 Subject: [PATCH] use alternative logo if present Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/477264a4c6aeba798c78c1070636cedfce12e931 Author: TangoCash Date: 2018-09-09 (Sun, 09 Sep 2018) --- src/driver/pictureviewer/pictureviewer.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 561304b17..04f15e508 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -4,6 +4,7 @@ #include "pictureviewer.h" #include "pv_config.h" #include +#include #include #include #include @@ -579,7 +580,19 @@ bool CPictureViewer::GetLogoName(const uint64_t& channel_id, const std::string& name = v_path[j]; return true; } - } + } + CZapitChannel * cc = NULL; + if (CNeutrinoApp::getInstance()->channelList) + cc = CNeutrinoApp::getInstance()->channelList->getChannel(channel_id); + if (cc) { + if (!cc->getAlternateLogo().empty()) + { + std::string lname = dlTmpName(cc->getAlternateLogo()); + name = lname; + cc->setAlternateLogo(lname); + return true; + } + } } return false; }