Shortcuts fixes

Levminer · Sep 17, 2022 · fd8a4d8 · fd8a4d8
1 parent fb019fc
commit fd8a4d8
Showing 1 changed file with 30 additions and 24 deletions.
diff --git a/interface/libraries/shortcuts.ts b/interface/libraries/shortcuts.ts
@@ -129,35 +129,41 @@ export const editShortcut = (id: number) => {
 export const registerShortcuts = () => {
 	globalShortcut.unregisterAll()
 
-	globalShortcut.register(settings.shortcuts.show, async () => {
-		await invoke("update_tray")
-
-		const windowShown = await window.appWindow.isVisible()
+	if (settings.shortcuts.show !== "None") {
+		globalShortcut.register(settings.shortcuts.show, async () => {
+			await invoke("update_tray")
+
+			const windowShown = await window.appWindow.isVisible()
+
+			if (windowShown === true) {
+				window.appWindow.hide()
+			} else {
+				await window.appWindow.show()
+				await window.appWindow.unminimize()
+				await window.appWindow.setFocus()
+			}
+		})
+	}
 
-		if (windowShown === true) {
-			window.appWindow.hide()
-		} else {
-			await window.appWindow.show()
-			await window.appWindow.unminimize()
-			await window.appWindow.setFocus()
-		}
-	})
+	if (settings.shortcuts.settings !== "None") {
+		globalShortcut.register(settings.shortcuts.settings, async () => {
+			const windowShown = await window.appWindow.isVisible()
 
-	globalShortcut.register(settings.shortcuts.settings, async () => {
-		const windowShown = await window.appWindow.isVisible()
+			if (windowShown === true) {
+				navigate("settings")
+			} else {
+				window.appWindow.show()
+			}
 
-		if (windowShown === true) {
 			navigate("settings")
-		} else {
-			window.appWindow.show()
-		}
-
-		navigate("settings")
-	})
+		})
+	}
 
-	globalShortcut.register(settings.shortcuts.exit, async () => {
-		exit()
-	})
+	if (settings.shortcuts.exit) {
+		globalShortcut.register(settings.shortcuts.exit, async () => {
+			exit()
+		})
+	}
 }
 
 registerShortcuts()