mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fb_generic: use file_exists() in getIconPath()

Browse Source 
* fix icons with absolute path
* rename path => icon

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-10-29 20:01:01 +02:00
committed by Thilo Graf
parent ff564e3fd7
commit bfdeed09e8
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/driver/fb_generic.cpp
View File

@@ -50,6 +50,7 @@
#include <gui/osd_helpers.h> #include <gui/osd_helpers.h>
#include <gui/pictureviewer.h> #include <gui/pictureviewer.h>
#include <system/debug.h> #include <system/debug.h>
#include <system/helpers.h>
#include <global.h> #include <global.h>
#include <hardware/video.h> #include <hardware/video.h>
#include <cs_api.h> #include <cs_api.h>
@@ -706,20 +707,19 @@ void CFrameBuffer::setIconBasePath(const std::string & iconPath)
std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type) std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type)
{ {
// why search when we have an absolut path? if ((icon_name.find("/", 0) != std::string::npos) && file_exists(icon_name))
if (icon_name.find("/", 0) != std::string::npos)
return icon_name; return icon_name;
std::vector<std::string> filetypes = { ".svg", ".png", ".jpg" }; std::vector<std::string> filetypes = { ".svg", ".png", ".jpg" };
std::string path = icon_name; std::string icon = icon_name;
std::string::size_type pos = icon_name.find_last_of("."); std::string::size_type pos = icon.find_last_of(".");
if (pos != std::string::npos && file_type.empty()) if (pos != std::string::npos && file_type.empty())
{ {
if (std::find(filetypes.begin(), filetypes.end(), icon_name.substr(pos)) != filetypes.end()) if (std::find(filetypes.begin(), filetypes.end(), icon_name.substr(pos)) != filetypes.end())
{ {
icon_name = path.substr(0, pos); icon_name = icon.substr(0, pos);
file_type = path.substr(pos + 1); file_type = icon.substr(pos + 1);
} }
} }
@@ -741,11 +741,9 @@ std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_ty
{ {
for (unsigned int i = 0; i < dir.size(); i++) for (unsigned int i = 0; i < dir.size(); i++)
{ {
path = std::string(dir[i]) + "/" + icon_name + filetypes[t]; icon = std::string(dir[i]) + "/" + icon_name + filetypes[t];
if (access(path.c_str(), F_OK) == 0) if (file_exists(icon))
{ return icon;
return path;
}
} }
} }