Skip to content

Commit

Permalink
fix usage of button masks for hotkeys
Browse files Browse the repository at this point in the history
I probably introduced this in a bad rebase
  • Loading branch information
bsstephan committed Mar 25, 2024
1 parent 580eb5e commit c4a3c78
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions www/src/Pages/SettingsPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -1201,7 +1201,7 @@ export default function SettingsPage() {
</Form.Control.Feedback>
</Col>
<Col sm="auto">+</Col>
{BUTTON_MASKS.map((mask) =>
{BUTTON_MASKS_OPTIONS.map((mask) =>
values[o] && values[o]?.buttonsMask & mask.value ? (
[
<Col sm="auto">
Expand All @@ -1224,7 +1224,7 @@ export default function SettingsPage() {
);
}}
>
{BUTTON_MASKS.map((o, i2) => (
{BUTTON_MASKS_OPTIONS.map((o, i2) => (
<option
key={`hotkey-${i}-button${i2}`}
value={o.value}
Expand Down Expand Up @@ -1254,7 +1254,7 @@ export default function SettingsPage() {
);
}}
>
{BUTTON_MASKS.map((o, i2) => (
{BUTTON_MASKS_OPTIONS.map((o, i2) => (
<option
key={`hotkey-${i}-buttonZero-${i2}`}
value={o.value}
Expand Down

0 comments on commit c4a3c78

Please sign in to comment.