Skip to content

Commit 7ed884a

Browse files
fix workers
1 parent 3722558 commit 7ed884a

File tree

4 files changed

+10
-21
lines changed

4 files changed

+10
-21
lines changed

baklava/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"electron-log": "^4.3.2",
9898
"electron-overlay-window": "^1.0.4",
9999
"electron-updater": "^4.3.8",
100-
"globkey": "^1.0.18",
100+
"globkey": "^1.0.19",
101101
"i18next": "^20.0.0",
102102
"i18next-node-fs-backend": "^2.1.3"
103103
},

baklava/src/utils/keybinds/index.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,7 @@ export function RegisterKeybinds(bWindows: bWindowsType) {
131131

132132
}
133133
export async function exitApp() {
134-
worker.on('message', async (msg) => {
135-
if (msg.type === 'exit') {
136-
await worker.terminate();
137-
globkey.unload();
138-
app.quit();
139-
}
140-
});
141-
worker.postMessage({ type: 'exit' });
134+
worker.removeAllListeners();
135+
await worker.terminate();
136+
app.quit();
142137
}

baklava/src/utils/keybinds/worker.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@ import globkey from 'globkey';
44
if (!isMainThread) {
55
let prev_keys = ['', '']
66
let shouldBreak = false;
7-
parentPort?.on('message', (msg) => {
8-
if (msg.type === 'exit') {
9-
shouldBreak = true;
10-
parentPort?.postMessage({ type: 'exit' });
11-
}
12-
})
137
while (true) {
148
if (shouldBreak) break;
15-
let keys = globkey.get_keys();
9+
let keys = globkey.getKeys();
1610
if (keys != prev_keys) {
1711
if (parentPort) parentPort.postMessage({ type: 'keys', keys: keys });
1812
}

baklava/yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ __metadata:
12431243
electron-log: ^4.3.2
12441244
electron-overlay-window: ^1.0.4
12451245
electron-updater: ^4.3.8
1246-
globkey: ^1.0.18
1246+
globkey: ^1.0.19
12471247
i18next: ^20.0.0
12481248
i18next-node-fs-backend: ^2.1.3
12491249
lodash: ^4.17.21
@@ -1826,10 +1826,10 @@ __metadata:
18261826
languageName: node
18271827
linkType: hard
18281828

1829-
"globkey@npm:^1.0.18":
1830-
version: 1.0.18
1831-
resolution: "globkey@npm:1.0.18"
1832-
checksum: bb557bfa8dc33c2134ab6e59cbadec56ea9b89aa0909b16740880f74414001c93cbd935f1bb379ad15c22379618412af5970247b28ea9411057049f5f1eea4c9
1829+
"globkey@npm:^1.0.19":
1830+
version: 1.0.19
1831+
resolution: "globkey@npm:1.0.19"
1832+
checksum: 610fd1b833992545a112057e019ed48e7107bc114c17c89be941a50b2a84426ada0b5e725d96372ff7aada8fb52c2aa867f759bb660f4be2eccd77b2d06f9a8c
18331833
languageName: node
18341834
linkType: hard
18351835

0 commit comments

Comments
 (0)