Set ready state after Neutralino.init

benjammin4dayz · Oct 28, 2024 · 02bf3cf · 02bf3cf
1 parent dec7df0
commit 02bf3cf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 32 deletions.
diff --git a/.ts-convert/resources/src/NeutralinoProvider.tsx b/.ts-convert/resources/src/NeutralinoProvider.tsx
@@ -51,27 +51,25 @@ export const NeutralinoProvider = ({
   useEffect(() => {
     try {
       Neutralino.init();
-      if (errorTimeout.current) {
-        clearTimeout(errorTimeout.current);
-        errorTimeout.current = null;
-      }
+      //
+      // If the state is reloaded while Neutralino is already initialized,
+      // the "ready" event won't fire. This should always be accurate because
+      // Neutralino's init function either passes or throws an error.
+      //
+      setReady(true);
     } catch (e) {
-      if (!errorTimeout.current) {
-        errorTimeout.current = setTimeout(() => {
-          setError(true);
-          errorTimeout.current = null;
-        }, failAfterMs);
-      }
+      errorTimeout.current = setTimeout(() => {
+        setError(true);
+        errorTimeout.current = null;
+      }, failAfterMs);
       console.warn('Neutralino failed to initialize', e);
     }
 
-    const onReady = () => {
-      setReady(true);
-    };
-    void Neutralino.events.on('ready', onReady);
-
     return () => {
-      void Neutralino.events.off('ready', onReady);
+      if (errorTimeout.current) {
+        clearTimeout(errorTimeout.current);
+        errorTimeout.current = null;
+      }
     };
   }, [failAfterMs]);
 

diff --git a/react-src/src/NeutralinoProvider.jsx b/react-src/src/NeutralinoProvider.jsx
@@ -35,27 +35,25 @@ export const NeutralinoProvider = ({
   useEffect(() => {
     try {
       Neutralino.init();
-      if (errorTimeout.current) {
-        clearTimeout(errorTimeout.current);
-        errorTimeout.current = null;
-      }
+      //
+      // If the state is reloaded while Neutralino is already initialized,
+      // the "ready" event won't fire. This should always be accurate because
+      // Neutralino's init function either passes or throws an error.
+      //
+      setReady(true);
     } catch (e) {
-      if (!errorTimeout.current) {
-        errorTimeout.current = setTimeout(() => {
-          setError(true);
-          errorTimeout.current = null;
-        }, failAfterMs);
-      }
+      errorTimeout.current = setTimeout(() => {
+        setError(true);
+        errorTimeout.current = null;
+      }, failAfterMs);
       console.warn('Neutralino failed to initialize', e);
     }
 
-    const onReady = () => {
-      setReady(true);
-    };
-    void Neutralino.events.on('ready', onReady);
-
     return () => {
-      void Neutralino.events.off('ready', onReady);
+      if (errorTimeout.current) {
+        clearTimeout(errorTimeout.current);
+        errorTimeout.current = null;
+      }
     };
   }, [failAfterMs]);