From 92184f0199246992cd83ac01e644c9d17375eb74 Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 23 Apr 2016 22:56:56 +0800 Subject: [PATCH] fix #1985 by always return to the parent dir of current doc in the FileManager --- frontend/apps/filemanager/filemanager.lua | 6 +++--- frontend/apps/reader/modules/readermenu.lua | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index 87436b9b8..c670774a0 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -229,10 +229,10 @@ function FileManager:init() self:handleEvent(Event:new("SetDimensions", self.dimen)) end -function FileManager:resetDimen(dimen) - self.dimen = dimen +function FileManager:reinit(path) + self.dimen = Screen:getSize() -- backup the root path and path items - self.root_path = self.file_chooser.path + self.root_path = path or self.file_chooser.path local path_items_backup = {} for k, v in pairs(self.file_chooser.path_items) do path_items_backup[k] = v diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index 0d4724290..ffed21153 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -38,14 +38,14 @@ function ReaderMenu:init() self:onTapCloseMenu() self.ui:onClose() local FileManager = require("apps/filemanager/filemanager") + local lastdir = nil + local last_file = G_reader_settings:readSetting("lastfile") + if last_file then + lastdir = last_file:match("(.*)/") + end if FileManager.instance then - FileManager.instance:resetDimen(Screen:getSize()) + FileManager.instance:reinit(lastdir) else - local lastdir = nil - local last_file = G_reader_settings:readSetting("lastfile") - if last_file then - lastdir = last_file:match("(.*)/") - end FileManager:showFiles(lastdir) end end,