From 58fb0d46b6c0db74630f24579ff172951976c7b0 Mon Sep 17 00:00:00 2001
From: Joseph Milazzo <joseph.v.milazzo@gmail.com>
Date: Wed, 27 Jul 2022 16:06:22 -0500
Subject: [PATCH] Fixed an issue where pages could be skipped in single due to
 prefetching overriding our recently set image (#1391)

---
 UI/Web/src/app/manga-reader/manga-reader.component.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/UI/Web/src/app/manga-reader/manga-reader.component.ts b/UI/Web/src/app/manga-reader/manga-reader.component.ts
index 16fddb889..9d2865186 100644
--- a/UI/Web/src/app/manga-reader/manga-reader.component.ts
+++ b/UI/Web/src/app/manga-reader/manga-reader.component.ts
@@ -1070,7 +1070,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     if (this.layoutMode === LayoutMode.Single) {
       const img = this.cachedImages.arr.find(img => this.readerService.imageUrlToPageNum(img.src) === this.pageNum);
       if (img) {
-        this.canvasImage = img; // If we tried to use this for double, then the src might change after being set (idk how tho)
+        this.canvasImage = img; // If we tried to use this for double, then the loadPage might not render correctly when switching layout mode
       } else {
         this.canvasImage.src = this.getPageUrl(this.pageNum);
       }
@@ -1297,14 +1297,15 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   prefetch() {
     let index = 1;
 
-    this.cachedImages.applyFor((item, internalIndex) => {
+    this.cachedImages.applyFor((item, _) => {
       const offsetIndex = this.pageNum + index;
       const urlPageNum = this.readerService.imageUrlToPageNum(item.src);
 
-      if (urlPageNum === offsetIndex) {
+      if (urlPageNum === offsetIndex || urlPageNum === this.pageNum) {
         index += 1;
         return;
       }
+      
       if (offsetIndex < this.maxPages - 1) {
         item.src = this.getPageUrl(offsetIndex);
         index += 1;