[fix] #155

VecHK · Jul 11, 2022 · cd741f9 · cd741f9
1 parent 8417382
commit cd741f9
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/src/core/layout/window-revert.ts b/src/core/layout/window-revert.ts
@@ -6,16 +6,39 @@ import { getSearchWindowTabURL, getWindowId, WindowID } from './window'
 
 const revertOperate = Atomic()
 
-export default function WindowRevert(base: Base) {
+async function revertWindowExists(
+  base: Pick<Base, 'getRevertContainerId' | 'setRevertContainerId'>
+): Promise<WindowID | false> {
   const { getRevertContainerId, setRevertContainerId } = base
+  const revert_container_id = getRevertContainerId()
+  if (revert_container_id === undefined) {
+    return false
+  } else {
+    try {
+      if (Boolean(
+        await chrome.windows.get(revert_container_id)
+      )) {
+        return revert_container_id
+      } else {
+        return false
+      }
+    } catch (err) {
+      setRevertContainerId(undefined)
+      return false
+    }
+  }
+}
+
+export default function WindowRevert(base: Base) {
+  const { setRevertContainerId } = base
 
   return (
     async function revert(search_window_id: WindowID): Promise<void> {
       revertOperate(async () => {
         const url_P = getSearchWindowTabURL(search_window_id)
 
-        const revert_container_id = getRevertContainerId()
-        if (revert_container_id !== undefined) {
+        const revert_container_id = await revertWindowExists(base)
+        if (revert_container_id !== false) {
           await chrome.windows.update(search_window_id, {
             state: 'normal'
           })