Fixed selection bug overwriting settigns

winder · May 24, 2024 · 37a5383 · 37a5383
1 parent f6ad4fc
commit 37a5383
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...main/java/com/willwinder/ugs/nbp/designer/gui/selectionsettings/FieldEventDispatcher.java b/...main/java/com/willwinder/ugs/nbp/designer/gui/selectionsettings/FieldEventDispatcher.java
@@ -41,6 +41,7 @@ This file is part of Universal Gcode Sender (UGS).
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
@@ -51,8 +52,8 @@ This file is part of Universal Gcode Sender (UGS).
  */
 public class FieldEventDispatcher {
     private final Set<FieldEventListener> listeners = ConcurrentHashMap.newKeySet();
-
     private final EnumMap<EntitySetting, JComponent> componentsMap = new EnumMap<>(EntitySetting.class);
+    private AtomicBoolean enabled = new AtomicBoolean(false);
 
     /**
      * Installs a listener to receive notification when the text of any
@@ -151,7 +152,9 @@ private void valueUpdated(PropertyChangeEvent propertyChangeEvent) {
 
 
     public void updateValue(EntitySetting entitySetting, Object object) {
-        listeners.forEach(l -> l.onFieldUpdate(entitySetting, object));
+        if (this.enabled.get()) {
+            listeners.forEach(l -> l.onFieldUpdate(entitySetting, object));
+        }
     }
 
     public void addListener(FieldEventListener listener) {
@@ -162,4 +165,8 @@ public void registerListener(EntitySetting entitySetting, JSlider slider) {
         componentsMap.put(entitySetting, slider);
         slider.addChangeListener(l -> updateValue(entitySetting, slider.getValue()));
     }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled.set(enabled);
+    }
 }
diff --git a/...in/java/com/willwinder/ugs/nbp/designer/gui/selectionsettings/SelectionSettingsPanel.java b/...in/java/com/willwinder/ugs/nbp/designer/gui/selectionsettings/SelectionSettingsPanel.java
@@ -241,7 +241,10 @@ public void setEnabled(boolean enabled) {
 
     @Override
     public void onSelectionEvent(SelectionEvent selectionEvent) {
+        // Temporarily disable the field event dispatcher so that it won't triggers updates on select
+        fieldEventDispatcher.setEnabled(false);
         onEvent(new EntityEvent(controller.getSelectionManager(), EventType.SELECTED));
+        fieldEventDispatcher.setEnabled(true);
     }
 
     @Override