mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
revert wrong conflict merge for New InfoMessage Concept
This commit is contained in:
14
reader.lua
14
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)
|
||||
|
||||
Reference in New Issue
Block a user