Merge branch 'master' of git://projects.vdr-developer.org/vdr-plugin-skindesigner

1 files changed, 2 insertions, 3 deletions

diff --git a/libtemplate/templatepixmap.c b/libtemplate/templatepixmap.c
index 4fbd513..a1d032b 100644
--- a/libtemplate/templatepixmap.c
+++ b/libtemplate/templatepixmap.c
@@ -78,11 +78,12 @@ void cTemplatePixmap::ParseDynamicParameters(map <string,int> *intTokens, bool i
 

     for (vector<cTemplateFunction*>::iterator func = functions.begin(); func != functions.end(); func++) {

         (*func)->SetContainer(x, y, width, height);

-        (*func)->CalculateParameters();

+        (*func)->ReCalculateParameters();

         (*func)->CompleteParameters();

         if ((*func)->GetType() == ftLoop) {

             cTemplateLoopFunction *loopFunc = dynamic_cast<cTemplateLoopFunction*>(*func);

             if (!loopFunc->Ready()) {

+                loopFunc->CalculateParameters();

                 loopFunc->SetIntTokens(intTokens);

                 loopFunc->ParseParameters();

                 loopFunc->UnsetIntTokens();

@@ -137,8 +138,6 @@ bool cTemplatePixmap::CalculateParameters(void) {
 

     for (vector<cTemplateFunction*>::iterator func = functions.begin(); func != functions.end(); func++) {

         (*func)->SetGlobals(globals);

-        if (!Ready())

-            continue;

         (*func)->SetContainer(0, 0, pixWidth, pixHeight);

         paramsValid = (*func)->CalculateParameters();

         (*func)->CompleteParameters();