From b7be4a8e5136f15a5fd2cdf938e89fa35174b7a1 Mon Sep 17 00:00:00 2001
From: "Davide P. Cervone" <dpvc@union.edu>
Date: Mon, 14 Jul 2025 10:37:27 -0400
Subject: [PATCH] Only stop the worker if it has been started

---
 ts/a11y/speech.ts           |  2 +-
 ts/a11y/speech/WebWorker.ts | 10 ++++++----
 ts/core/DOMAdaptor.ts       |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ts/a11y/speech.ts b/ts/a11y/speech.ts
index e7ceae9c2..7f4b5423d 100644
--- a/ts/a11y/speech.ts
+++ b/ts/a11y/speech.ts
@@ -316,7 +316,7 @@ export function SpeechMathDocumentMixin<
      * @override
      */
     public async done() {
-      await this.webworker.Stop();
+      await this.webworker?.Stop();
       return super.done();
     }
   };
diff --git a/ts/a11y/speech/WebWorker.ts b/ts/a11y/speech/WebWorker.ts
index 5e73867c5..d86c61fe8 100644
--- a/ts/a11y/speech/WebWorker.ts
+++ b/ts/a11y/speech/WebWorker.ts
@@ -468,8 +468,10 @@ export class WorkerHandler<N, T, D> {
 
   /**
    * Terminates the worker.
+   *
+   * @returns {Promise<any>}  The promise for the worker termination.
    */
-  public Terminate() {
+  public Terminate(): Promise<any> | void {
     this.debug('Terminating pending tasks');
     for (const task of this.tasks) {
       task.reject(
@@ -478,18 +480,18 @@ export class WorkerHandler<N, T, D> {
     }
     this.tasks = [];
     this.debug('Terminating worker');
-    this.worker.terminate();
+    return this.worker.terminate();
   }
 
   /**
    * Stop the worker and clear the values so that the worker can be
    * restarted, if desired.
    */
-  public Stop() {
+  public async Stop() {
     if (!this.worker) {
       throw Error('Worker has not been started');
     }
-    this.Terminate();
+    await this.Terminate();
     this.worker = null;
     this.ready = false;
   }
diff --git a/ts/core/DOMAdaptor.ts b/ts/core/DOMAdaptor.ts
index 27486b6a7..16889ddcb 100644
--- a/ts/core/DOMAdaptor.ts
+++ b/ts/core/DOMAdaptor.ts
@@ -47,7 +47,7 @@ export type PageBBox = {
 export interface minWorker {
   addEventListener(kind: string, listener: (event: Event) => void): void;
   postMessage(msg: any): void;
-  terminate(): void;
+  terminate(): Promise<any> | void;
 }
 
 /*****************************************************************/