summaryrefslogtreecommitdiffstats
path: root/gui/action.cpp
diff options
context:
space:
mode:
authorVojtech Bocek <vbocek@gmail.com>2014-02-08 02:05:33 +0100
committerVojtech Bocek <vbocek@gmail.com>2014-02-12 19:19:32 +0100
commit072205626caec16f3028a9b698e792e525848581 (patch)
treed262f85a3f58a7a86181dcadc24d6c352928f3f2 /gui/action.cpp
parentProperly delete all GUIObjects and pages on theme reload (diff)
downloadandroid_bootable_recovery-072205626caec16f3028a9b698e792e525848581.tar
android_bootable_recovery-072205626caec16f3028a9b698e792e525848581.tar.gz
android_bootable_recovery-072205626caec16f3028a9b698e792e525848581.tar.bz2
android_bootable_recovery-072205626caec16f3028a9b698e792e525848581.tar.lz
android_bootable_recovery-072205626caec16f3028a9b698e792e525848581.tar.xz
android_bootable_recovery-072205626caec16f3028a9b698e792e525848581.tar.zst
android_bootable_recovery-072205626caec16f3028a9b698e792e525848581.zip
Diffstat (limited to '')
-rw-r--r--gui/action.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/gui/action.cpp b/gui/action.cpp
index 951feb114..66ee5d6f0 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -144,16 +144,13 @@ int GUIAction::NotifyKey(int key)
return 0;
}
-int GUIAction::NotifyVarChange(std::string varName, std::string value)
+int GUIAction::NotifyVarChange(const std::string& varName, const std::string& value)
{
+ GUIObject::NotifyVarChange(varName, value);
+
if (varName.empty() && !isConditionValid() && !mKey && !mActionW)
doActions();
-
- // This handles notifying the condition system of page start
- if (varName.empty() && isConditionValid())
- NotifyPageSet();
-
- if ((varName.empty() || IsConditionVariable(varName)) && isConditionValid() && isConditionTrue())
+ else if((varName.empty() || IsConditionVariable(varName)) && isConditionValid() && isConditionTrue())
doActions();
return 0;