From 5146f15e44d9523e3dc96bf0f5e0aeaf1bee9c2f Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Fri, 10 Apr 2015 16:44:29 +0200
Subject: fixed bug that string tokens are not evaluated in area conditions

---
 libtemplate/templatepixmap.c | 4 +++-
 libtemplate/templatepixmap.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'libtemplate')

diff --git a/libtemplate/templatepixmap.c b/libtemplate/templatepixmap.c
index 7379633..473561a 100644
--- a/libtemplate/templatepixmap.c
+++ b/libtemplate/templatepixmap.c
@@ -80,11 +80,13 @@ void cTemplatePixmap::ClearDynamicParameters(void) {
     parameters->ClearDynamicParameters();
 }
 
-void cTemplatePixmap::ParseDynamicParameters(map <string,int> *intTokens, bool initFuncs) {
+void cTemplatePixmap::ParseDynamicParameters(map <string,string> *stringTokens, map <string,int> *intTokens, bool initFuncs) {
     parameters->ClearDynamicParameters();
     parameters->SetIntTokens(intTokens); 
+    parameters->SetStringTokens(stringTokens); 
     parameters->ParseParameters();
     parameters->UnsetIntTokens();
+    parameters->UnsetStringTokens();
     
     if (!DoExecute()) {
         parameters->ClearDynamicParameters();
diff --git a/libtemplate/templatepixmap.h b/libtemplate/templatepixmap.h
index 3be1816..fd2d3ce 100644
--- a/libtemplate/templatepixmap.h
+++ b/libtemplate/templatepixmap.h
@@ -63,7 +63,7 @@ public:
     //Clear dynamically set pixmap parameters
     void ClearDynamicParameters(void);
     //Parse pixmap parameters with dynamically set Tokens
-    void ParseDynamicParameters(map <string,int> *intTokens, bool initFuncs);
+    void ParseDynamicParameters(map <string,string> *stringTokens, map <string,int> *intTokens, bool initFuncs);
     //Parse all function parameters with dynamically set Tokens
     void ParseDynamicFunctionParameters(map <string,string> *stringTokens, map <string,int> *intTokens);
     //Calculate size of drawport in case area scrolls
-- 
cgit v1.2.3