From 4ccdbc90a573579d626af47908440d3914960427 Mon Sep 17 00:00:00 2001
From: hius07 <62179190+hius07@users.noreply.github.com>
Date: Thu, 10 Feb 2022 12:08:51 +0200
Subject: [PATCH] Doc settings reset: fix default block_rendering_mode (#8792)

---
 frontend/apps/filemanager/filemanagerutil.lua  | 2 ++
 frontend/apps/reader/modules/readertypeset.lua | 2 +-
 frontend/apps/reader/modules/readerview.lua    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/apps/filemanager/filemanagerutil.lua b/frontend/apps/filemanager/filemanagerutil.lua
index 643e950b1..38e12e804 100644
--- a/frontend/apps/filemanager/filemanagerutil.lua
+++ b/frontend/apps/filemanager/filemanagerutil.lua
@@ -42,6 +42,7 @@ function filemanagerutil.resetDocumentSettings(file)
     local settings_to_keep = {
         bookmarks = true,
         bookmarks_sorted = true,
+        bookmarks_sorted_20220106 = true,
         bookmarks_version = true,
         cre_dom_version = true,
         highlight = true,
@@ -57,6 +58,7 @@ function filemanagerutil.resetDocumentSettings(file)
                 doc_settings:delSetting(k)
             end
         end
+        doc_settings:makeTrue("docsettings_reset_done") -- for readertypeset block_rendering_mode
         doc_settings:close()
     end
 end
diff --git a/frontend/apps/reader/modules/readertypeset.lua b/frontend/apps/reader/modules/readertypeset.lua
index 8beef8b54..7885aa61d 100644
--- a/frontend/apps/reader/modules/readertypeset.lua
+++ b/frontend/apps/reader/modules/readertypeset.lua
@@ -66,7 +66,7 @@ function ReaderTypeset:onReadSettings(config)
     if config:has("copt_block_rendering_mode") then
         self.block_rendering_mode = config:readSetting("copt_block_rendering_mode")
     else
-        if config:has("last_xpointer") then
+        if config:has("last_xpointer") and not config:has("docsettings_reset_done") then
             -- We have a last_xpointer: this book was previously opened
             self.block_rendering_mode = 0
         else
diff --git a/frontend/apps/reader/modules/readerview.lua b/frontend/apps/reader/modules/readerview.lua
index 509a1bd22..bd87c3307 100644
--- a/frontend/apps/reader/modules/readerview.lua
+++ b/frontend/apps/reader/modules/readerview.lua
@@ -1001,6 +1001,7 @@ function ReaderView:onCloseDocument()
 end
 
 function ReaderView:onReaderReady()
+    self.ui.doc_settings:delSetting("docsettings_reset_done")
     self.settings_last_save_tv = UIManager:getTime()
 end