mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "plugins.cpp: fix show *_hint.svg"

Browse Source 
This reverts commit 0d4dc63bd1.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f78f8cbd37
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-03-27 (Sun, 27 Mar 2022)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-03-27 22:06:29 +02:00
parent b8959e8373
commit 53b0bca581
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/plugins.cpp
View File

@@ -198,8 +198,9 @@ bool CPlugins::parseCfg(plugin *plugin_data)
plugin_data->integration = PLUGIN_INTEGRATION_DISABLED; plugin_data->integration = PLUGIN_INTEGRATION_DISABLED;
plugin_data->hinticon = NEUTRINO_ICON_HINT_PLUGIN; plugin_data->hinticon = NEUTRINO_ICON_HINT_PLUGIN;
std::string hintIcon = ""; std::string _hintIcon = plugin_data->plugindir + "/" + plugin_data->filename + "_hint.png";
std::string _hintIconfile = plugin_data->plugindir + "/" + plugin_data->filename + "_hint.png"; if (access(_hintIcon.c_str(), F_OK) == 0)
plugin_data->hinticon = _hintIcon;
for (int i = 0; i < linecount; i++) for (int i = 0; i < linecount; i++)
{ {
@@ -242,7 +243,7 @@ bool CPlugins::parseCfg(plugin *plugin_data)
} }
else if (cmd == "hinticon") else if (cmd == "hinticon")
{ {
hintIcon = parm; plugin_data->hinticon = parm;
} }
else if (cmd == "type") else if (cmd == "type")
{ {
@@ -282,20 +283,9 @@ bool CPlugins::parseCfg(plugin *plugin_data)
if (plugin_data->name.empty()) if (plugin_data->name.empty())
plugin_data->name = plugin_data->filename; plugin_data->name = plugin_data->filename;
std::string _hintIconCfg = plugin_data->plugindir + "/" + hintIcon; _hintIcon = plugin_data->plugindir + "/" + plugin_data->hinticon + ".png";
if (access(_hintIcon.c_str(), F_OK) == 0)
if (!hintIcon.empty() && access((_hintIconCfg + ".svg").c_str() , F_OK) == 0) plugin_data->hinticon = _hintIcon;
{
plugin_data->hinticon = _hintIconCfg + ".svg";
}
else if (!hintIcon.empty() && access((_hintIconCfg + ".png").c_str(), F_OK) == 0)
{
plugin_data->hinticon = _hintIconCfg + ".png";
}
else if (access(_hintIconfile.c_str(), F_OK) == 0)
{
plugin_data->hinticon = _hintIconfile;
}
overrideType(plugin_data, g_settings.plugins_disabled, P_TYPE_DISABLED) || overrideType(plugin_data, g_settings.plugins_disabled, P_TYPE_DISABLED) ||
overrideType(plugin_data, g_settings.plugins_game, P_TYPE_GAME) || overrideType(plugin_data, g_settings.plugins_game, P_TYPE_GAME) ||