From 12de0419d0a272a2f8cad071a9e4c452c2483cbc Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 29 Oct 2021 20:01:01 +0200 Subject: [PATCH] - fb_generic: simplify showFrame() Signed-off-by: Thilo Graf --- src/driver/fb_generic.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index 72ed091a9..b717eb4f1 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -1597,7 +1597,13 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode) std::string picture = getIconPath(filename); bool ret = false; - if (access(picture.c_str(), F_OK) == 0 && !(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED)) + if (picture.empty()) + { + dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, filename.c_str()); + return ret; + } + + if (!(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED)) { if (videoDecoder) { @@ -1612,14 +1618,6 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode) else dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], no videoplayer instance available\n", __func__, __LINE__); } - else - { - if (!(fallback_mode & SHOW_FRAME_FALLBACK_MODE_IMAGE_UNSCALED)) - { - dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], image not found: %s\n", __func__, __LINE__, picture.c_str()); - picture = ""; - } - } if (!ret) {