From bf0937d53c3a461f9d67d6509f3ae8dccd99ec21 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 9 Jan 2020 21:37:16 +0100 Subject: [PATCH] fix compiler warnings Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/9c62e803255c44a6c9e63bbe0f771c6b580b72f3 Author: Jacek Jendrzej Date: 2020-01-09 (Thu, 09 Jan 2020) --- src/driver/pictureviewer/pictureviewer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index d41e711ab..dd32b65d2 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -554,14 +554,17 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C CSectionsdClient::CurrentNextInfo CurrentNext; CEitManager::getInstance()->getCurrentNextServiceKey(ChannelID, CurrentNext); - if (CSectionsdClient::epgflags::has_current && !CurrentNext.current_name.empty()) + if (CurrentNext.flags & CSectionsdClient::epgflags::has_current && !CurrentNext.current_name.empty()) EventName = CurrentNext.current_name; } // add neccessary paths to v_path v_path.clear(); - if (lcd4l_mode) + if (lcd4l_mode){ +#ifdef ENABLE_LCD4LINUX v_path.push_back(g_settings.lcd4l_logodir); +#endif + } v_path.push_back(g_settings.logo_hdd_dir); if (g_settings.logo_hdd_dir != LOGODIR_VAR) v_path.push_back(LOGODIR_VAR);