From 5a2c8e4b5e4f964eebde66004af9522c13659b80 Mon Sep 17 00:00:00 2001
From: poire-z <poire-z@users.noreply.github.com>
Date: Tue, 3 Oct 2017 21:33:12 +0200
Subject: [PATCH] Revert 2 commits that caused crengine scroll mode side
 effects (#3295)

394be8a (#2855) and 2b3b310 (#3183) introduced side effects (scroll mode
crashing and TOC being reset and rebuild). This reverts parts of them
not yet reverted.
---
 .../apps/reader/modules/readerrolling.lua     | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/frontend/apps/reader/modules/readerrolling.lua b/frontend/apps/reader/modules/readerrolling.lua
index c000ac541..8dbcfef45 100644
--- a/frontend/apps/reader/modules/readerrolling.lua
+++ b/frontend/apps/reader/modules/readerrolling.lua
@@ -166,9 +166,7 @@ end
 
 function ReaderRolling:onReaderReady()
     self:setupTouchZones()
-    self.ui:registerPostReadyCallback(function()
-        self.setupXpointer()
-    end)
+    self.setupXpointer()
 end
 
 function ReaderRolling:setupTouchZones()
@@ -282,11 +280,7 @@ end
 
 function ReaderRolling:getLastPercent()
     if self.view.view_mode == "page" then
-        if self.old_page then
-            return self.current_page / self.old_page
-        else
-            return nil
-        end
+        return self.current_page / self.old_page
     else
         -- FIXME: the calculated percent is not accurate in "scroll" mode.
         return self.ui.document:getPosFromXPointer(
@@ -483,9 +477,7 @@ function ReaderRolling:updatePos()
     local new_height = self.ui.document.info.doc_height
     local new_page = self.ui.document.info.number_of_pages
     if self.old_doc_height ~= new_height or self.old_page ~= new_page then
-        if self.old_page then
-            self:_gotoXPointer(self.xpointer)
-        end
+        self:_gotoXPointer(self.xpointer)
         self.old_doc_height = new_height
         self.old_page = new_page
         self.ui:handleEvent(Event:new("UpdateToc"))
@@ -499,12 +491,11 @@ end
 function ReaderRolling:onChangeViewMode()
     self.ui.document:_readMetadata()
     self.old_doc_height = self.ui.document.info.doc_height
-    local old_page = self.old_page
     self.old_page = self.ui.document.info.number_of_pages
     self.ui:handleEvent(Event:new("UpdateToc"))
-    if self.xpointer and old_page then
+    if self.xpointer then
         self:_gotoXPointer(self.xpointer)
-    elseif self.xpointer == nil then
+    else
         table.insert(self.ui.postInitCallback, function()
             self:_gotoXPointer(self.xpointer)
         end)