From 8c145de05310d7dd47fc43929ee22c0e4ee0d420 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 31 Aug 2018 09:34:16 +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. --- 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 fb4b0bd04..6db8a1902 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -1548,12 +1548,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()); }