Merge pull request #2730 from ControlSystemStudio/CSSTUDIO-1950

CSSTUDIO-1950 Remove calls to `fireItemDataConfigChanged()` when archivers are removed from instances of `PVItem`.
ControlSystemStudio · Jul 10, 2023 · 147815d · 147815d
2 parents f6ace83 + 65b745a
commit 147815d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/PVItem.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/model/PVItem.java
@@ -242,9 +242,11 @@ public void addArchiveDataSource(final ArchiveDataSource archs[])
     /** @param archive Archive to remove as a source from this item. */
     public void removeArchiveDataSource(final ArchiveDataSource archive)
     {
-        // Archive removed -> (Probably) no need to get new data
-        if (archives.remove(archive))
+        boolean change = archives.remove(archive);
+        if (!Preferences.use_default_archives && change) {
+            // Archive removed -> (Probably) no need to get new data
             fireItemDataConfigChanged(false);
+        }
     }
 
     /** @param archs Archives to remove as a source from this item. Ignored when not used. */
@@ -254,7 +256,7 @@ public void removeArchiveDataSource(final List<ArchiveDataSource> archs)
         for (ArchiveDataSource archive : archs)
             if (archives.remove(archive))
                 change = true;
-        if (change)
+        if (!Preferences.use_default_archives && change)
             fireItemDataConfigChanged(false);
     }