From 6c0670740d75fe12694c383504583124b79a594e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Tue, 2 Oct 2012 21:21:59 -0400 Subject: [PATCH] revert wrong conflict merge for New InfoMessage Concept --- reader.lua | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/reader.lua b/reader.lua index 18f131c13..e8e06ccc5 100755 --- a/reader.lua +++ b/reader.lua @@ -138,15 +138,10 @@ else end - --- @TODO dirty workaround, find a way to force native system poll --- screen orientation and upside down mode 09.03 2012 -Screen:setRotationMode(Screen.native_rotation_mode) - if file then - running = openFile(file) - else - running = false - end +if ARGV[optind] then + if lfs.attributes(ARGV[optind], "mode") == "directory" then + showFileManager(ARGV[optind]) + elseif lfs.attributes(ARGV[optind], "mode") == "file" then showReader(ARGV[optind], optarg["p"]) end UIManager:run() @@ -158,7 +153,6 @@ else end - -- @TODO dirty workaround, find a way to force native system poll -- screen orientation and upside down mode 09.03 2012 Screen:setRotationMode(Screen.native_rotation_mode)