From a775af135a1dccd069063a976c8637d263061c52 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 13 Dec 2015 18:18:32 +0100 Subject: [PATCH] framebuffer_ng: use global ICONSDIR_VAR this implements CFrameBuffer part of commit 89a11de65 ("fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h") --- src/driver/framebuffer_ng.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index ce64c8a97..52ae8dabb 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -59,7 +59,6 @@ extern int gfxfd; extern CPictureViewer * g_PicViewer; #define ICON_CACHE_SIZE 1024*1024*2 // 2mb -#define ICONDIR_VAR "/var/tuxbox/icons/" #define BACKGROUNDIMAGEWIDTH 720 @@ -816,7 +815,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in std::string newname = filename; /* if it is not an absolute path, search in configured paths */ if (filename.find("/", 0) == std::string::npos) { - newname = ICONDIR_VAR + filename + ".png"; + newname = ICONSDIR_VAR + filename + ".png"; if (access(newname.c_str(), F_OK)) newname = iconBasePath + filename + ".png"; } @@ -838,7 +837,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in goto _display; } - newname = ICONDIR_VAR + filename + ".raw"; + newname = ICONSDIR_VAR + filename + ".raw"; if (access(newname.c_str(), F_OK)) newname = iconBasePath + filename + ".raw";