From 70f83e1fb9b51ea2b6bd414475982b114e7847fe Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 28 Jul 2013 03:02:07 +0200
Subject: [PATCH] Parse action handler condition for interface link in advance

---
 code/nel/include/nel/gui/interface_link.h |  1 +
 code/nel/src/gui/interface_link.cpp       | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/code/nel/include/nel/gui/interface_link.h b/code/nel/include/nel/gui/interface_link.h
index ffa6ac0c7..87389a185 100644
--- a/code/nel/include/nel/gui/interface_link.h
+++ b/code/nel/include/nel/gui/interface_link.h
@@ -141,6 +141,7 @@ namespace NLGUI
 		std::string					 _ActionHandler;
 		std::string					 _AHParams;
 		std::string					 _AHCond;
+		CInterfaceExprNode			*_AHCondParsed;
 		CInterfaceGroup				*_AHParent;
 		static TLinkList             _LinkList;
 		TLinkList::iterator			 _ListEntry;
diff --git a/code/nel/src/gui/interface_link.cpp b/code/nel/src/gui/interface_link.cpp
index d672e9402..c40788040 100644
--- a/code/nel/src/gui/interface_link.cpp
+++ b/code/nel/src/gui/interface_link.cpp
@@ -165,6 +165,7 @@ namespace NLGUI
 		_NextTriggeredLink[0] = _NextTriggeredLink[1] = NULL;
 		_Triggered[0] = _Triggered[1] = false;
 		_ParseTree = NULL;
+		_AHCondParsed = NULL;
 	}
 
 	//===========================================================
@@ -187,6 +188,9 @@ namespace NLGUI
 		_LinkList.erase(_ListEntry);
 
 		delete _ParseTree;
+		_ParseTree = NULL;
+		delete _AHCondParsed;
+		_AHCondParsed = NULL;
 	}
 
 	//===========================================================
@@ -243,7 +247,12 @@ namespace NLGUI
 		//
 		_ActionHandler = actionHandler;
 		_AHParams = ahParams;
+		nlassert(!_AHCondParsed);
 		_AHCond = ahCond;
+		if (!ahCond.empty())
+		{
+			_AHCondParsed = CInterfaceExpr::buildExprTree(ahCond);
+		}
 		_AHParent = parentGroup;
 		return true;
 	}
@@ -360,15 +369,14 @@ namespace NLGUI
 		if (!_ActionHandler.empty())
 		{
 			// If there is a condition, test it.
-			bool	launch= true;
-			if(!_AHCond.empty())
+			bool launch = _AHCond.empty();
+			if (_AHCondParsed)
 			{
-				launch= false;
-				CInterfaceExprValue		result;
-				if(CInterfaceExpr::eval(_AHCond, result))
-					launch= result.getBool();
+				CInterfaceExprValue result;
+				_AHCondParsed->eval(result);
+				launch = result.getBool();
 			}
-			if(launch)
+			if (launch)
 			{
 				CAHManager::getInstance()->runActionHandler(_ActionHandler, _AHParent, _AHParams);
 				// do not add any code after this line because this can be deleted !!!!