From d11dd6365faa4f85fd3960f755a26178b74d40d7 Mon Sep 17 00:00:00 2001
From: SomeGuy <97603719+Commodore64user@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:27:42 +0000
Subject: [PATCH] Update screensaver.lua

stops calculation from rounding up at values 99.5 < x < 100
---
 frontend/ui/screensaver.lua | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/ui/screensaver.lua b/frontend/ui/screensaver.lua
index 4555592de..dd4ce5868 100644
--- a/frontend/ui/screensaver.lua
+++ b/frontend/ui/screensaver.lua
@@ -148,13 +148,7 @@ function Screensaver:expandSpecial(message, fallback)
             time_left_chapter = self:_calcAverageTimeForPages(ui.toc:getChapterPagesLeft(currentpage) or doc:getTotalPagesLeft(currentpage))
             time_left_document = self:_calcAverageTimeForPages(doc:getTotalPagesLeft(currentpage))
         end
-        if currentpage == 1 then
-            percent = 0
-        elseif ((currentpage / totalpages) * 100) < 1 then
-            percent = 1
-        else
-            percent = math.floor((currentpage * 100) / totalpages)
-        end
+        percent = math.min( Math.round((currentpage * 100) / totalpages), 99)
         props = ui.doc_props
     elseif DocSettings:hasSidecarFile(lastfile) then
         -- If there's no ReaderUI instance, but the file has sidecar data, use that
@@ -162,7 +156,7 @@ function Screensaver:expandSpecial(message, fallback)
         totalpages = doc_settings:readSetting("doc_pages") or totalpages
         percent = doc_settings:readSetting("percent_finished") or percent
         currentpage = Math.round(percent * totalpages)
-        percent = math.floor(percent * 100)
+        percent = math.min( Math.round(percent * 100), 99)
         props = FileManagerBookInfo.extendProps(doc_settings:readSetting("doc_props"), lastfile)
         -- Unable to set time_left_chapter and time_left_document without ReaderUI, so leave N/A
     end