From 76de509ae535f3aa29f6caa78db2574b16a3210d Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Wed, 20 Nov 2024 08:02:53 +0700
Subject: [PATCH] chore(reader): Adjust error handler

---
 .../ui/reader/viewer/pager/PagerPageHolder.kt        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
index 24d9517835..d066846c63 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@@ -40,6 +40,7 @@ import eu.kanade.tachiyomi.widget.ViewPagerAdapter
 import java.io.InputStream
 import kotlin.math.min
 import kotlin.math.roundToInt
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.Default
 import kotlinx.coroutines.Job
@@ -502,8 +503,15 @@ class PagerPageHolder(
                     }
                 }
             }
-        } catch (e: Exception) {
-            Logger.e(e) { "Failed to set reader page image" }
+        } catch (e: Throwable) {
+            val logMsg = "Failed to set reader page image"
+            if (e is CancellationException)
+                Logger.w(e) { logMsg }  // probably user exiting the reader page before the image loads
+            else
+                Logger.e(e) { logMsg }
+            withUIContext {
+                setError()
+            }
         }
     }