summaryrefslogtreecommitdiffstats
path: root/gui/twmsg.cpp
diff options
context:
space:
mode:
authorEthan Yonker <dees_troy@teamw.in>2016-02-25 20:47:30 +0100
committerDees Troy <dees_troy@teamw.in>2016-03-31 16:44:24 +0200
commit472f506817bb1af2fceb039ba148d15723944562 (patch)
tree187516086121c42b1b671f69b4fc252fe5498b1c /gui/twmsg.cpp
parentDataManager Updates (diff)
downloadandroid_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.tar
android_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.tar.gz
android_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.tar.bz2
android_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.tar.lz
android_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.tar.xz
android_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.tar.zst
android_bootable_recovery-472f506817bb1af2fceb039ba148d15723944562.zip
Diffstat (limited to '')
-rw-r--r--gui/twmsg.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/gui/twmsg.cpp b/gui/twmsg.cpp
index 9fe9e5a94..57f192234 100644
--- a/gui/twmsg.cpp
+++ b/gui/twmsg.cpp
@@ -89,13 +89,16 @@ public:
resname = name.substr(0, pos);
default_value = name.substr(pos + 1);
}
+#ifndef BUILD_TWRPTAR_MAIN
const ResourceManager* res = PageManager::GetResources();
if (res) {
if (default_value.empty())
return res->FindString(resname);
else
return res->FindString(resname, default_value);
- } else if (!default_value.empty()) {
+ }
+#endif
+ if (!default_value.empty()) {
return default_value;
}
return name;
@@ -112,10 +115,12 @@ class DataLookup : public StringLookup
public:
virtual std::string operator()(const std::string& name) const
{
+#ifndef BUILD_TWRPTAR_MAIN
std::string value;
if (DataManager::GetValue(name, value) == 0)
return value;
else
+#endif
return "";
}
};