From 2bb5082943900dcd7acb13c5c0ec3e8ec1b0427d Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sun, 24 May 2020 08:11:39 -0400 Subject: [PATCH] #831 Resolves issue with playlist editor and channel map editor. (#832) Co-authored-by: Denny --- .../gui/playlist/channel/MPT1327ConfigurationEditor.java | 2 +- .../java/io/github/dsheirer/playlist/PlaylistManager.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java b/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java index b7eb9e4c..275921be 100644 --- a/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java +++ b/src/main/java/io/github/dsheirer/gui/playlist/channel/MPT1327ConfigurationEditor.java @@ -247,7 +247,7 @@ public class MPT1327ConfigurationEditor extends ChannelConfigurationEditor mChannelMapComboBox.setMaxWidth(Double.MAX_VALUE); mChannelMapComboBox.setDisable(true); mChannelMapComboBox.setTooltip(new Tooltip("Select a channel map to use for this system")); - mChannelMapComboBox.getItems().addAll(getPlaylistManager().getChannelMapModel().getChannelMaps()); + mChannelMapComboBox.setItems(getPlaylistManager().getChannelMapModel().getChannelMaps()); mChannelMapComboBox.setDisable(true); mChannelMapComboBox.getSelectionModel().selectedItemProperty() .addListener((observable, oldValue, newValue) -> modifiedProperty().set(true)); diff --git a/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java b/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java index 14d0278a..c268afeb 100644 --- a/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java +++ b/src/main/java/io/github/dsheirer/playlist/PlaylistManager.java @@ -32,6 +32,7 @@ import io.github.dsheirer.controller.channel.Channel.ChannelType; import io.github.dsheirer.controller.channel.ChannelEvent; import io.github.dsheirer.controller.channel.ChannelModel; import io.github.dsheirer.controller.channel.ChannelProcessingManager; +import io.github.dsheirer.controller.channel.map.ChannelMap; import io.github.dsheirer.controller.channel.map.ChannelMapModel; import io.github.dsheirer.icon.IconModel; import io.github.dsheirer.module.log.EventLogManager; @@ -113,10 +114,7 @@ public class PlaylistManager implements Listener mAliasModel.aliasList().addListener((ListChangeListener)c -> schedulePlaylistSave()); - mChannelMapModel.addListener(t -> { - //Save the playlist for all channel map events - schedulePlaylistSave(); - }); + mChannelMapModel.getChannelMaps().addListener((ListChangeListener)c -> schedulePlaylistSave()); mBroadcastModel.addListener(broadcastEvent -> { switch(broadcastEvent.getEvent())