even more fixes

projectstorm · Feb 26, 2024 · c03564b · c03564b
1 parent 9c98a59
commit c03564b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
   "dependencies": {
     "@jitsi/robotjs": "^0.6.13",
     "auto-launch": "^5.0.6",
+    "async": "^3.2.5",
     "electron-json-storage": "^4.6.0",
     "lodash": "^4.17.21",
     "node-hid": "^3.0.0",
@@ -45,6 +46,7 @@
     "node-mac-permissions": "^2.3.0"
   },
   "devDependencies": {
+    "@types/async": "^3.2.24",
     "@types/auto-launch": "^5.0.5",
     "@types/electron-json-storage": "^4.5.4",
     "@types/lodash": "^4.14.202",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/PointerEngine.ts b/src/PointerEngine.ts
@@ -37,8 +37,8 @@ export class PointerDevice extends BaseObserver<PointerDeviceListener> {
     this.resource.on('error', error_cb);
     this.resource.on('data', data_cb);
     this.dispose = () => {
-      this.resource.off('error', error_cb);
-      this.resource.off('data', data_cb);
+      this.resource?.off('error', error_cb);
+      this.resource?.off('data', data_cb);
       this.dispose = null;
     };
   }

diff --git a/src/main.ts b/src/main.ts
@@ -8,6 +8,7 @@ import AutoLaunch from 'auto-launch';
 import { createLogger, transports } from 'winston';
 import { buildLoadingMenu, buildMenu } from './menu';
 import { waitForAllPermissions } from './permissions';
+import {} from 'async';
 
 require('source-map-support').install();
 
@@ -69,12 +70,7 @@ app.on('ready', async () => {
     setupMovement();
   };
 
-  pointerEngine.registerListener({
-    devicesChanged: () => {
-      buildMenuWrapped();
-      setupMovement();
-    }
-  });
+  configEngine.init();
 
   // add a startup delay
   const delay = (configEngine.config.startupDelay || 0) * 1_000;
@@ -85,10 +81,16 @@ app.on('ready', async () => {
 
   // might want startup delay
   setTimeout(() => {
-    configEngine.init();
     pointerEngine.init();
     displayEngine.init();
 
+    pointerEngine.registerListener({
+      devicesChanged: () => {
+        buildMenuWrapped();
+        setupMovement();
+      }
+    });
+
     buildMenuWrapped();
     setupMovement();
   }, delay);