From 6d73442ecd030f8abd375e7823a1358dc39c9454 Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Sun, 30 Jun 2024 14:29:22 +0300 Subject: [PATCH] Reader: always exit to book folder (#12129) --- frontend/apps/reader/modules/readermenu.lua | 3 ++- frontend/apps/reader/modules/readerstatus.lua | 3 ++- frontend/apps/reader/readerui.lua | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua index e6c913630..eaf6c0403 100644 --- a/frontend/apps/reader/modules/readermenu.lua +++ b/frontend/apps/reader/modules/readermenu.lua @@ -45,8 +45,9 @@ function ReaderMenu:init() remember = false, callback = function() self:onTapCloseMenu() + local file = self.ui.document.file self.ui:onClose() - self.ui:showFileManager() + self.ui:showFileManager(file) end, }, main = { diff --git a/frontend/apps/reader/modules/readerstatus.lua b/frontend/apps/reader/modules/readerstatus.lua index 1d4e984c0..254add142 100644 --- a/frontend/apps/reader/modules/readerstatus.lua +++ b/frontend/apps/reader/modules/readerstatus.lua @@ -164,9 +164,10 @@ end function ReaderStatus:openFileBrowser() local FileManager = require("apps/filemanager/filemanager") + local file = self.ui.document.file self.ui:onClose() if not FileManager.instance then - self.ui:showFileManager() + self.ui:showFileManager(file) end end diff --git a/frontend/apps/reader/readerui.lua b/frontend/apps/reader/readerui.lua index 33c1a03c7..7fbb99323 100644 --- a/frontend/apps/reader/readerui.lua +++ b/frontend/apps/reader/readerui.lua @@ -648,7 +648,7 @@ function ReaderUI:showReaderCoroutine(file, provider, seamless) UIManager:show(InfoMessage:new{ text = _("No reader engine for this file or invalid file.") }) - self:showFileManager() + self:showFileManager(file) end end) end @@ -668,7 +668,7 @@ function ReaderUI:doShowReader(file, provider, seamless) UIManager:show(InfoMessage:new{ text = _("No reader engine for this file or invalid file.") }) - self:showFileManager() + self:showFileManager(file) return end if document.is_locked then @@ -678,7 +678,7 @@ function ReaderUI:doShowReader(file, provider, seamless) if coroutine.running() then local unlock_success = coroutine.yield() if not unlock_success then - self:showFileManager() + self:showFileManager(file) return end end @@ -859,8 +859,9 @@ function ReaderUI:dealWithLoadDocumentFailure() end function ReaderUI:onHome() + local file = self.document.file self:onClose() - self:showFileManager() + self:showFileManager(file) return true end