From b7bf11bb67e6154ebb886ec088002f3bf7fcbdc3 Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Fri, 22 Mar 2024 16:53:27 -0500 Subject: [PATCH] fix usage of button masks for hotkeys I probably introduced this in a bad rebase --- www/src/Pages/SettingsPage.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/src/Pages/SettingsPage.jsx b/www/src/Pages/SettingsPage.jsx index bce79679b..c5613c3f0 100644 --- a/www/src/Pages/SettingsPage.jsx +++ b/www/src/Pages/SettingsPage.jsx @@ -12,7 +12,7 @@ import isNil from 'lodash/isNil'; import './SettingsPage.scss'; import Section from '../Components/Section'; import WebApi, { baseButtonMappings } from '../Services/WebApi'; -import { BUTTON_MASKS, BUTTON_MASKS_OPTIONS, getButtonLabels } from '../Data/Buttons'; +import { BUTTON_MASKS_OPTIONS, getButtonLabels } from '../Data/Buttons'; const SHA256 = (ascii) => { @@ -1201,7 +1201,7 @@ export default function SettingsPage() { + - {BUTTON_MASKS.map((mask) => + {BUTTON_MASKS_OPTIONS.map((mask) => values[o] && values[o]?.buttonsMask & mask.value ? ( [ @@ -1224,7 +1224,7 @@ export default function SettingsPage() { ); }} > - {BUTTON_MASKS.map((o, i2) => ( + {BUTTON_MASKS_OPTIONS.map((o, i2) => (