summaryrefslogtreecommitdiffstats
path: root/gui/blanktimer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/blanktimer.cpp')
-rw-r--r--gui/blanktimer.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index 95b6c47ff..06208e273 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -81,16 +81,13 @@ void blanktimer::checkForTimeout() {
string blanktimer::getBrightness(void) {
string result;
- string brightness_path;
- DataManager::GetValue("tw_brightness_file", brightness_path);
- if (brightness_path == "/nobrightness")
- return brightness_path;
- DataManager::GetValue("tw_brightness", result);
- if (result == "") {
- result = "255";
+
+ if (DataManager::GetIntValue("tw_has_brightnesss_file")) {
+ DataManager::GetValue("tw_brightness", result);
+ if (result.empty())
+ result = "255";
}
return result;
-
}
void blanktimer::resetTimerAndUnblank(void) {
@@ -112,7 +109,7 @@ void blanktimer::resetTimerAndUnblank(void) {
gui_forceRender();
// No break here, we want to keep going
case kDim:
- if (orig_brightness != "/nobrightness")
+ if (!orig_brightness.empty())
TWFunc::Set_Brightness(orig_brightness);
state = kOn;
case kOn: