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

Merge branch 'master' into skinsetup

Browse Source
This commit is contained in:
louis 2015-01-19 09:47:16 +01:00
commit f2f7246c0b
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -159,4 +159,4 @@ Version 0.1.4
- added "empty" operator additionally to "isset" to check in a condition - added "empty" operator additionally to "isset" to check in a condition
if a string token is set if a string token is set
- added token {nummenuitem} for plugin menu lists - added token {nummenuitem} for plugin menu lists
- fixed bug that custom int tokens were not considered in conditions

30
libtemplate/parameter.c
View File

@ -342,20 +342,24 @@ int cConditionalParameter::EvaluateParameter(string token, map < string, int > *
map < string, int >::iterator hitGlobals = globals->intVars.find(token); map < string, int >::iterator hitGlobals = globals->intVars.find(token);
if (hitGlobals != globals->intVars.end()) { if (hitGlobals != globals->intVars.end()) {
return hitGlobals->second; return hitGlobals->second;
} else { }
//then check tokens //then check custom tokens
if (intTokens) { map < string, int >::iterator hitCustomTokens = globals->customIntTokens.find(token);
map < string, int >::iterator hit = intTokens->find(token); if (hitCustomTokens != globals->customIntTokens.end()) {
if (hit != intTokens->end()) { return hitCustomTokens->second;
return hit->second; }
} //then check tokens
if (intTokens) {
map < string, int >::iterator hit = intTokens->find(token);
if (hit != intTokens->end()) {
return hit->second;
} }
if (stringTokens) { }
map < string, string >::iterator hit = stringTokens->find(token); if (stringTokens) {
if (hit != stringTokens->end()) { map < string, string >::iterator hit = stringTokens->find(token);
string value = hit->second; if (hit != stringTokens->end()) {
return atoi(value.c_str()); string value = hit->second;
} return atoi(value.c_str());
} }
} }
return 0; return 0;