From 1b5f90384a1bca47be5d63fd1c0cc5be990c22ca Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 1 Sep 2018 14:34:24 +0200 Subject: [PATCH] src/driver/fb_generic.cpp: unifiy path search in showFrame() This allows to use same paths for images like for icons. Was a request, because images inside theme directories were not found. Thanks bellum for this hint. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f47bbbfe7bd8da8cb34fcb7f58089a1ee35db0ab Author: Thilo Graf Date: 2018-09-01 (Sat, 01 Sep 2018) --- src/driver/fb_generic.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index 26a6bf06e..ed660fdb0 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -1540,12 +1540,7 @@ void CFrameBuffer::Clear() void CFrameBuffer::showFrame(const std::string & filename) { - std::string picture = std::string(ICONSDIR_VAR) + "/" + filename; - if (access(picture.c_str(), F_OK)) - picture = iconBasePath + "/" + filename; - if (filename.find("/", 0) != std::string::npos) - picture = filename; - + std::string picture = getIconPath(filename, ""); videoDecoder->ShowPicture(picture.c_str()); }