frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 17:58:31 +02:00
Code Issues Releases Wiki Activity

fixed bug that tokens in image pathes are not replaced correctly

Browse Source
This commit is contained in:
louis 2015-04-30 17:11:34 +02:00
parent 4fe74f8439
commit 563a0485ee
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -304,5 +304,6 @@ Version 0.4.3
in displaychannel in displaychannel
- added cardsystem name to ecm info - added cardsystem name to ecm info
- added correct menucategory for skin setups - added correct menucategory for skin setups
- fixed bug that tokens in image pathes are not replaced correctly

12
libtemplate/templatefunction.c
View File

@ -1292,6 +1292,12 @@ void cTemplateFunction::ParseStringParameters(void) {
for (map < string, string >::iterator it = stringTokens->begin(); it != stringTokens->end(); it++) { for (map < string, string >::iterator it = stringTokens->begin(); it != stringTokens->end(); it++) {
size_t found = path.find(it->first); size_t found = path.find(it->first);
if (found != string::npos) { if (found != string::npos) {
size_t posEndBracket = found + (it->first).size();
if (posEndBracket < path.size()) {
string endChar = path.substr(posEndBracket, 1);
if (endChar.compare("}"))
continue;
}
updated = true; updated = true;
imgPath = path; imgPath = path;
if (found > 0 && ((it->first).size() + 2 <= imgPath.size())) if (found > 0 && ((it->first).size() + 2 <= imgPath.size()))
@ -1302,6 +1308,12 @@ void cTemplateFunction::ParseStringParameters(void) {
for (map < string, int >::iterator it = intTokens->begin(); it != intTokens->end(); it++) { for (map < string, int >::iterator it = intTokens->begin(); it != intTokens->end(); it++) {
size_t found = path.find(it->first); size_t found = path.find(it->first);
if (found != string::npos) { if (found != string::npos) {
size_t posEndBracket = found + (it->first).size();
if (posEndBracket < path.size()) {
string endChar = path.substr(posEndBracket, 1);
if (endChar.compare("}"))
continue;
}
updated = true; updated = true;
imgPath = path; imgPath = path;
if (found > 0 && ((it->first).size() + 2 <= imgPath.size())) { if (found > 0 && ((it->first).size() + 2 <= imgPath.size())) {