ericek111/ts3java
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Hand out hotkey bindings as a snapshot

Browse Source 
Hotkeys.all() returned its synchronised list, and every reader had to
lock it while iterating: a lock owned by one class and taken by four
others. It now returns a copy, and the lock stays inside Hotkeys.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-09-25 10:36:43 +00:00
parent eeccb495eb
commit 5b1809cc2d
5 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ts3-client/swing/src/main/java/com/ts3client/ui/HotkeyService.java
View File

@@ -70,10 +70,8 @@ final class HotkeyService {
/** The binding for an action with no argument, or {@code null} when unbound. */
Hotkey find(HotkeyAction action) {
synchronized (hotkeys.all()) {
for (Hotkey h : hotkeys.all()) {
if (h.action == action) return h;
}
for (Hotkey h : hotkeys.all()) {
if (h.action == action) return h;
}
return null;
}

8
ts3-client/swing/src/main/java/com/ts3client/ui/HotkeysPanel.java
View File

@@ -39,9 +39,7 @@ final class HotkeysPanel extends JPanel {
this.service = service;
setBorder(new ScaledEmptyBorder(8, 8, 8, 8));
synchronized (service.all()) {
for (Hotkey h : service.all()) working.add(h.copy());
}
for (Hotkey h : service.all()) working.add(h.copy());
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
table.setRowHeight(table.getRowHeight() + UIScale.scale(4));
@@ -113,9 +111,7 @@ final class HotkeysPanel extends JPanel {
/** Picks the stored bindings up again after something else changed them. */
void reload() {
working.clear();
synchronized (service.all()) {
for (Hotkey h : service.all()) working.add(h.copy());
}
for (Hotkey h : service.all()) working.add(h.copy());
model.fireTableDataChanged();
}

6
ts3-client/swing/src/main/java/com/ts3client/ui/VoiceActivationPanel.java
View File

@@ -325,10 +325,8 @@ final class VoiceActivationPanel extends FormPanel {
dlg.setVisible(true);
if (!dlg.isConfirmed()) return;
List<Hotkey> updated = new java.util.ArrayList<>();
synchronized (hotkeys.all()) {
for (Hotkey h : hotkeys.all()) {
if (h != existing) updated.add(h.copy());
}
for (Hotkey h : hotkeys.all()) {
if (h != existing) updated.add(h.copy());
}
updated.add(dlg.result());
hotkeys.replaceAll(updated);