From ed4396821f7cb6aacb36245f1d55beb290f4079a Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Mon, 9 Sep 2019 17:34:27 +0200 Subject: [PATCH] [fix] ReadSettings Inverse reading order (#5350) `self.inverse_reading_order == nil and G_reader_settings:has("inverse_reading_order")` could easily be false, which would then incorrectly turn the setting off. Fixes . --- frontend/apps/reader/modules/readerpaging.lua | 4 +--- frontend/apps/reader/modules/readerrolling.lua | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/frontend/apps/reader/modules/readerpaging.lua b/frontend/apps/reader/modules/readerpaging.lua index 9783e2ed8..688a4bfc0 100644 --- a/frontend/apps/reader/modules/readerpaging.lua +++ b/frontend/apps/reader/modules/readerpaging.lua @@ -180,10 +180,8 @@ function ReaderPaging:onReadSettings(config) self.flipping_zoom_mode = config:readSetting("flipping_zoom_mode") or "page" self.flipping_scroll_mode = config:readSetting("flipping_scroll_mode") or false self.inverse_reading_order = config:readSetting("inverse_reading_order") - if self.inverse_reading_order == nil and G_reader_settings:has("inverse_reading_order") then + if self.inverse_reading_order == nil then self.inverse_reading_order = G_reader_settings:isTrue("inverse_reading_order") - else - self.inverse_reading_order = false end end diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua index 49933ed44..ca58d640b 100644 --- a/frontend/apps/reader/modules/readerrolling.lua +++ b/frontend/apps/reader/modules/readerrolling.lua @@ -188,11 +188,10 @@ function ReaderRolling:onReadSettings(config) if self.show_overlap_enable == nil then self.show_overlap_enable = DSHOWOVERLAP end + self.inverse_reading_order = config:readSetting("inverse_reading_order") - if self.inverse_reading_order == nil and G_reader_settings:has("inverse_reading_order") then + if self.inverse_reading_order == nil then self.inverse_reading_order = G_reader_settings:isTrue("inverse_reading_order") - else - self.inverse_reading_order = false end -- This self.visible_pages may not be the current nb of visible pages