From 1b2d0b71b07279e599a37cbfaa8a1fa7b7a36ca6 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Wed, 18 Apr 2012 19:43:55 +0800
Subject: [PATCH] fallback to stop framework approach on screensaver fix

---
 commands.lua      | 7 ++++---
 launchpad/kpdf.sh | 3 +++
 reader.lua        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/commands.lua b/commands.lua
index c47215b8b..b932bac58 100644
--- a/commands.lua
+++ b/commands.lua
@@ -168,14 +168,15 @@ function Commands:new(obj)
 			Screen:saveCurrentBB()
 			Screen.kpv_rotation_mode = Screen.cur_rotation_mode
 			fb:setOrientation(Screen.native_rotation_mode)
-			--os.execute("killall -cont cvm")
+			util.sleep(1)
+			os.execute("killall -cont cvm")
 		end
 	)
 	obj:add(KEY_OUTOF_SCREEN_SAVER, nil, "Slider",
 		"toggle screen saver",
 		function()
-			util.sleep(3)
-			--os.execute("killall -stop cvm")
+			util.usleep(1500000)
+			os.execute("killall -stop cvm")
 			fb:setOrientation(Screen.kpv_rotation_mode)
 			Screen:restoreFromSavedBB()
 			fb:refresh(0)
diff --git a/launchpad/kpdf.sh b/launchpad/kpdf.sh
index c43dac6f8..c1f81c700 100755
--- a/launchpad/kpdf.sh
+++ b/launchpad/kpdf.sh
@@ -18,6 +18,9 @@ if test "$1" == "--framework_stop"; then
 	/etc/init.d/framework stop
 fi
 
+# stop cvm
+killall -stop cvm
+
 # finally call reader
 ./reader.lua "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log
 
diff --git a/reader.lua b/reader.lua
index 54551e4c2..2a1d882b3 100755
--- a/reader.lua
+++ b/reader.lua
@@ -169,6 +169,6 @@ fb:setOrientation(Screen.native_rotation_mode)
 
 input.closeAll()
 if util.isEmulated()==0 then
-	--os.execute("killall -cont cvm")
+	os.execute("killall -cont cvm")
 	os.execute('echo "send '..KEY_MENU..'" > /proc/keypad;echo "send '..KEY_MENU..'" > /proc/keypad')
 end