From c4bc4c3ef75e54c8af1a902ca5f1a675b0755957 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 14 Jan 2020 23:51:20 +0100 Subject: [PATCH] pictureviewer: fix display of eventlogos; we don't have the ENABLE_LCD4LINUX define Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/0b70770a225e08a529c7bbec5f08240844913779 Author: vanhofen Date: 2020-01-14 (Tue, 14 Jan 2020) Origin message was: ------------------ - pictureviewer: fix display of eventlogos; we don't have the ENABLE_LCD4LINUX define --- src/driver/pictureviewer/pictureviewer.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index dd32b65d2..27871f67c 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -560,11 +560,8 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C // 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);