every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_global_hotkey_controller' into develop

Browse Source
This commit is contained in:
Sakamoto Shiina
2025-02-11 15:26:12 +09:00
parent 945b2a83a8 9f728f46d3
commit 26a3e868e2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src-ui/app/_app_controllers/GlobalHotKeyController.jsx
View File

@@ -1,22 +1,25 @@
import { useEffect } from "react"; import { useEffect } from "react";
import { useHotkeys } from "@logics_configs"; import { useHotkeys } from "@logics_configs";
import { useIsBackendReady, useIsSoftwareUpdating } from "@logics_common"; import { useIsBackendReady, useIsSoftwareUpdating, useIsVrctAvailable } from "@logics_common";
export const GlobalHotKeyController = () => { export const GlobalHotKeyController = () => {
const { currentIsBackendReady } = useIsBackendReady(); const { currentIsBackendReady } = useIsBackendReady();
const { currentIsSoftwareUpdating } = useIsSoftwareUpdating(); const { currentIsSoftwareUpdating } = useIsSoftwareUpdating();
const { registerShortcuts, unregisterAll } = useHotkeys(); const { registerShortcuts, unregisterAll } = useHotkeys();
const { currentIsVrctAvailable } = useIsVrctAvailable();
useEffect(() => { useEffect(() => {
const is_backend_ready = currentIsBackendReady.data; const is_backend_ready = currentIsBackendReady.data;
const is_software_updating = currentIsSoftwareUpdating.data; const is_software_updating = currentIsSoftwareUpdating.data;
const is_vrct_available = currentIsVrctAvailable.data;
if (is_backend_ready && !is_software_updating) { if (is_vrct_available && is_backend_ready && !is_software_updating) {
registerShortcuts(); registerShortcuts();
} else if (is_software_updating) { } else {
unregisterAll(); unregisterAll();
} }
}, [currentIsBackendReady.data, currentIsSoftwareUpdating.data]); }, [currentIsBackendReady.data, currentIsSoftwareUpdating.data, currentIsVrctAvailable.data]);
return null; return null;
}; };