From 072205626caec16f3028a9b698e792e525848581 Mon Sep 17 00:00:00 2001 From: Vojtech Bocek Date: Sat, 8 Feb 2014 02:05:33 +0100 Subject: Cache results of GUIObject::isConditionTrue() Signed-off-by: Vojtech Bocek Change-Id: Ia50f7c365b2dc0a65ee046bb42972e3594264878 --- gui/pages.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gui/pages.cpp') diff --git a/gui/pages.cpp b/gui/pages.cpp index 73aab0352..2953eddb8 100644 --- a/gui/pages.cpp +++ b/gui/pages.cpp @@ -519,13 +519,8 @@ void Page::SetPageFocus(int inFocus) int Page::NotifyVarChange(std::string varName, std::string value) { - std::vector::iterator iter; - - // Don't try to handle a lack of handlers - if (mActions.size() == 0) - return 1; - - for (iter = mActions.begin(); iter != mActions.end(); ++iter) + std::vector::iterator iter; + for (iter = mObjects.begin(); iter != mObjects.end(); ++iter) { if ((*iter)->NotifyVarChange(varName, value)) LOGERR("An action handler errored on NotifyVarChange.\n"); @@ -865,7 +860,10 @@ PageSet* PageManager::SelectPackage(std::string name) tmp = FindPackage(name); if (tmp) + { mCurrentSet = tmp; + mCurrentSet->NotifyVarChange("", ""); + } else LOGERR("Unable to find package.\n"); -- cgit v1.2.3