Theaninova/DeviceManager
1
0
Fork 0
mirror of https://github.com/CharaChorder/DeviceManager.git synced 2026-01-22 18:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate chords crash

Browse Source 
fix: duplicate confirm dialog does not show affected chord
fixes #137
fixes #163
This commit is contained in:
Thea Schöbl
2025-02-14 15:17:22 +01:00
parent fb1f5b7ec7
commit f319714489
4 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/routes/(app)/config/EditActions.svelte
View File

@@ -39,7 +39,7 @@
});
}
}
let redoQueue: Change[] = $state([]);
let redoQueue: Change[][] = $state([]);
async function save() {
try {
@@ -47,10 +47,10 @@
if (!port) return;
$syncStatus = "uploading";
for (const [id, { actions, phrase, deleted }] of $overlay.chords) {
if (!deleted) {
if (id !== JSON.stringify(actions)) {
const existingChord = await port.getChordPhrase(actions);
for (const [id, chord] of $overlay.chords) {
if (!chord.deleted) {
if (id !== JSON.stringify(chord.actions)) {
const existingChord = await port.getChordPhrase(chord.actions);
if (
existingChord !== undefined &&
!(await askForConfirmation(
@@ -58,26 +58,30 @@
$LL.configure.chords.conflict.DESCRIPTION(),
$LL.configure.chords.conflict.CONFIRM(),
$LL.configure.chords.conflict.ABORT(),
actions.slice(0, actions.lastIndexOf(0)),
chord,
))
) {
changes.update((changes) =>
changes.filter(
(it) =>
!(
it.type === ChangeType.Chord &&
JSON.stringify(it.id) === id
changes
.map((it) =>
it.filter(
(it) =>
!(
it.type === ChangeType.Chord &&
JSON.stringify(it.id) === id
),
),
),
)
.filter((it) => it.length > 0),
);
continue;
}
await port.deleteChord({ actions: JSON.parse(id) });
}
await port.setChord({ actions, phrase });
await port.setChord({ actions: chord.actions, phrase: chord.phrase });
} else {
await port.deleteChord({ actions });
await port.deleteChord({ actions: chord.actions });
}
}