From d50d3b0b0e7e33a18770d4c2ccaf8f8f69eb93a1 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 25 Feb 2025 16:29:49 +0100
Subject: [PATCH] Reset `#renderError` on `RenderingCancelledException` (PR
 19128 follow-up)

This restores the behaviour that existed prior to PR 19128, see e.g. https://github.com/mozilla/pdf.js/blob/8727a04ae588545c8e954c143b9fc64384712461/web/pdf_page_view.js#L908-L911, since `RenderingCancelledException` should still overwrite any previously seen Error.
---
 web/base_pdf_page_view.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/base_pdf_page_view.js b/web/base_pdf_page_view.js
index 42546f83d..fa37052a6 100644
--- a/web/base_pdf_page_view.js
+++ b/web/base_pdf_page_view.js
@@ -169,16 +169,18 @@ class BasePDFPageView {
       await renderTask.promise;
       this.#showCanvas?.(true);
     } catch (e) {
-      error = e;
       // When zooming with a `drawingDelay` set, avoid temporarily showing
       // a black canvas if rendering was cancelled before the `onContinue`-
       // callback had been invoked at least once.
-      if (error instanceof RenderingCancelledException) {
+      if (e instanceof RenderingCancelledException) {
         return;
       }
+      error = e;
 
       this.#showCanvas?.(true);
     } finally {
+      this.#renderError = error;
+
       // The renderTask may have been replaced by a new one, so only remove
       // the reference to the renderTask if it matches the one that is
       // triggering this callback.
@@ -186,8 +188,6 @@ class BasePDFPageView {
         this.renderTask = null;
       }
     }
-    this.#renderError = error;
-
     this.renderingState = RenderingStates.FINISHED;
 
     onFinish(renderTask);