From 8d4456172b795d61ff4dcfbf8d7cbad87e78856f Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 15 Jun 2024 13:25:51 +0200 Subject: [PATCH] Reduce duplication when handling the "test" message from the worker The feature-testing on the worker-thread has been simplified in previous pull requests, which means that we can simplify this main-thread handler as well. --- src/display/api.js | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/display/api.js b/src/display/api.js index ef2511fdb..82dacf519 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -2173,32 +2173,26 @@ class PDFWorker { messageHandler.on("test", data => { worker.removeEventListener("error", onWorkerError); - if (this.destroyed) { + if (this.destroyed || !data) { terminateEarly(); - return; // worker was destroyed + return; } - if (data) { - this._messageHandler = messageHandler; - this._port = worker; - this._webWorker = worker; + this._messageHandler = messageHandler; + this._port = worker; + this._webWorker = worker; - this._readyCapability.resolve(); - // Send global setting, e.g. verbosity level. - messageHandler.send("configure", { - verbosity: this.verbosity, - }); - } else { - this._setupFakeWorker(); - messageHandler.destroy(); - worker.terminate(); - } + this._readyCapability.resolve(); + // Send global setting, e.g. verbosity level. + messageHandler.send("configure", { + verbosity: this.verbosity, + }); }); messageHandler.on("ready", data => { worker.removeEventListener("error", onWorkerError); if (this.destroyed) { terminateEarly(); - return; // worker was destroyed + return; } try { sendTest();