From f8e2f375656b5ed8e90a501aea4f6925fe7d7d5d Mon Sep 17 00:00:00 2001
From: bigbiff bigbiff <bigbiff@teamw.in>
Date: Wed, 27 Feb 2013 20:50:43 -0500
Subject: Load user saved setting for blank timer on recovery startup Fix
 persistence of military time

---
 gui/blanktimer.cpp | 2 +-
 gui/gui.cpp        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'gui')

diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index d991d40b3..cf35f6544 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -37,6 +37,7 @@ extern "C" {
 #include <sstream>
 #include "pages.hpp"
 #include "blanktimer.hpp"
+#include "../data.hpp"
 extern "C" {
 #include "../common.h"
 #include "../recovery_ui.h"
@@ -46,7 +47,6 @@ extern "C" {
 
 blanktimer::blanktimer(void) {
 	blanked = 0;
-	sleepTimer = 60;
 	orig_brightness = getBrightness();
 }
 
diff --git a/gui/gui.cpp b/gui/gui.cpp
index 4788fe0df..f08d68be3 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -185,9 +185,12 @@ input_thread (void *cookie)
 	0, lshift = 0, rshift = 0, key_repeat = 0;
   static struct timeval touchStart;
   HardwareKeyboard kb;
+  string seconds;
 
   //start screen timeout threads
   blankTimer.setTimerThread();
+  DataManager::GetValue("tw_screen_timeout_secs", seconds);
+  blankTimer.setTime(atoi(seconds.c_str()));
 
   for (;;)
 	{
-- 
cgit v1.2.3