From 067c26982e4b374fbb51fa49d9930ddf0c8e00fd Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 4 Apr 2020 16:53:01 +0300
Subject: [PATCH] setTimeout refactoring

---
 ext/mixed/js/core.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/mixed/js/core.js b/ext/mixed/js/core.js
index ca37a26a..4314926c 100644
--- a/ext/mixed/js/core.js
+++ b/ext/mixed/js/core.js
@@ -331,14 +331,15 @@ const yomichan = (() => {
                     if (timeout !== null) {
                         timeoutId = window.setTimeout(() => {
                             timeoutId = null;
-                            reject(new Error(`Listener timed out in ${timeout} ms`));
                             eventHandler.removeListener(runtimeMessageCallback);
+                            reject(new Error(`Listener timed out in ${timeout} ms`));
                         }, timeout);
                     }
 
                     const cleanupResolve = (value) => {
                         if (timeoutId !== null) {
                             window.clearTimeout(timeoutId);
+                            timeoutId = null;
                         }
                         eventHandler.removeListener(runtimeMessageCallback);
                         sendResponse();