From d31128799af964125e878ff23251dccd140b9f0c Mon Sep 17 00:00:00 2001 From: Christopher Serr Date: Sat, 24 Jul 2021 12:45:11 +0200 Subject: [PATCH] Fix Hotkeys not being set properly When changing the hotkeys in the settings, it doesn't properly set the hotkeys anymore. This is because of a refactor that we merged in `livesplit-core` that unregisters the hotkeys while the `HotkeySystem` is deactivated. The hotkey settings deactivate the hotkeys so you don't accidentally split / reset / ... the timer in the background. The bug was that it was completely impossible to set hotkeys while they are deactivated. --- .github/workflows/ci.yml | 2 +- livesplit-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68078d5..7863dd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,7 @@ jobs: git -C binaryen pull || git clone https://github.com/WebAssembly/binaryen binaryen cd binaryen cmake . - make wasm-opt + make -j wasm-opt # FIXME: Use actions-rs/install@v0.1 again once it can handle wasm-bindgen - name: Install wasm-bindgen diff --git a/livesplit-core b/livesplit-core index 8913f88..d991984 160000 --- a/livesplit-core +++ b/livesplit-core @@ -1 +1 @@ -Subproject commit 8913f8827acecbf8f3bd88a719843381dfdbf6cc +Subproject commit d9919848d8d1aa18b30b780eeb544bbeb2964689