Merge pull request #1712 from DSheirer/968-alias-editor-clear-overlap…

…-state #968 Playlist Alias Editor - Clear Overlap Error Warning Once Resolved
DSheirer · Nov 9, 2023 · 7302e28 · 7302e28
2 parents 09e19e1 + 8845306
commit 7302e28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasConfigurationEditor.java
@@ -387,7 +387,7 @@ private TableView<Alias> getAliasTableView()
             idsColumn.setCellValueFactory(new IdentifierCountCell());
 
             TableColumn<Alias, Boolean> errorsColumn = new TableColumn<>("Error");
-            errorsColumn.setPrefWidth(80);
+            errorsColumn.setPrefWidth(120);
             errorsColumn.setCellValueFactory(new PropertyValueFactory<>("overlap"));
             errorsColumn.setCellFactory(param ->
             {

diff --git a/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/alias/AliasItemEditor.java
@@ -362,7 +362,10 @@ public void save()
                 for(AliasID aliasID: getIdentifiersList().getItems())
                 {
                     //Create a copy of the identifier so that the alias and the editor don't have the same instance
-                    alias.addAliasID(AliasFactory.copyOf(aliasID));
+                    //and reset the overlap flag (if set) so that the alias list can reevaluate the overlap state.
+                    AliasID copy = AliasFactory.copyOf(aliasID);
+                    copy.setOverlap(false);
+                    alias.addAliasID(copy);
                 }
 
                 //Remove and replace alias actions

diff --git a/src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java b/src/main/java/io/github/dsheirer/source/tuner/rtl/r8x/r828d/R828DEmbeddedTuner.java
@@ -123,7 +123,7 @@ else if(frequency < 250_000_000)
         }
         catch(UsbException e)
         {
-            throw new SourceException("R820TTunerController - exception while setting frequency [" + frequency + "] - " +
+            throw new SourceException("R828DTunerController - exception while setting frequency [" + frequency + "] - " +
                     e.getLocalizedMessage());
         }
         finally