1 files changed, 9 insertions, 1 deletions
diff --git a/src/components/OAuth2Button.tsx b/src/components/OAuth2Button.tsx
index 1b3d588..d67b1ab 100644
--- a/src/components/OAuth2Button.tsx
+++ b/src/components/OAuth2Button.tsx
@@ -50,8 +50,15 @@ function doLogin(disableFunction: (newState: boolean) => void) {
     "height=700,width=500,location=no,menubar=no,resizable=no,status=no,titlebar=no,left=300,top=300"
   )
 
+  const interval = setInterval(() => {
+    if (windowRef?.closed) {
+      clearInterval(interval);
+      disableFunction(false);
+    }
+  }, 500)
+
   window.onmessage = (code: MessageEvent) => {
-    if (code.data.hello) {
+    if (code.data.source) {
       // React DevTools has a habit of sending messages, ignore them.
       return;
     }
@@ -62,6 +69,7 @@ function doLogin(disableFunction: (newState: boolean) => void) {
       console.log("Code received:", code.data);
 
       disableFunction(false);
+      clearInterval(interval);
 
       window.onmessage = null;
     }