From eef536a737c663277f55414dcb9b7b0fe77069c7 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 9 Jan 2020 09:52:52 +0100 Subject: [PATCH] fix compiler warnings --- src/driver/pictureviewer/pictureviewer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 1eb851086..d7a58e510 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -554,16 +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){ #ifdef ENABLE_LCD4LINUX - if (lcd4l_mode) 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);