From c397b5a601b5ed87d2ad9c0fe021efcddf00615a Mon Sep 17 00:00:00 2001
From: Denny Sheirer <dennissheirer2002@yahoo.com>
Date: Mon, 12 Oct 2020 09:26:59 -0400
Subject: [PATCH] #950 Resolves issue where message and event panels were
 aggregating across all selected now playing channels. (#951)

Co-authored-by: Denny <denny@denny-desktop>
---
 .../java/io/github/dsheirer/module/HistoryModule.java    | 9 +++++++++
 .../dsheirer/module/decode/event/DecodeEventPanel.java   | 2 +-
 .../module/decode/event/MessageActivityPanel.java        | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/dsheirer/module/HistoryModule.java b/src/main/java/io/github/dsheirer/module/HistoryModule.java
index 889b229c..b79cb36b 100644
--- a/src/main/java/io/github/dsheirer/module/HistoryModule.java
+++ b/src/main/java/io/github/dsheirer/module/HistoryModule.java
@@ -80,6 +80,15 @@ public abstract class HistoryModule<T> extends Module implements Listener<T>
         mBroadcaster.addListener(listener);
     }
 
+    /**
+     * Removes the listener from receiving items.
+     * @param listener to remove
+     */
+    public void removeListener(Listener<T> listener)
+    {
+        mBroadcaster.removeListener(listener);
+    }
+
     /**
      * Primary item receiver method.
      */
diff --git a/src/main/java/io/github/dsheirer/module/decode/event/DecodeEventPanel.java b/src/main/java/io/github/dsheirer/module/decode/event/DecodeEventPanel.java
index 0c41ed55..ac7b74fa 100644
--- a/src/main/java/io/github/dsheirer/module/decode/event/DecodeEventPanel.java
+++ b/src/main/java/io/github/dsheirer/module/decode/event/DecodeEventPanel.java
@@ -139,7 +139,7 @@ public class DecodeEventPanel extends JPanel implements Listener<ProcessingChain
     {
         if(mCurrentEventHistory != null)
         {
-            mCurrentEventHistory.addListener(null);
+            mCurrentEventHistory.removeListener(mEventModel);
         }
 
         EventQueue.invokeLater(() -> {
diff --git a/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java b/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java
index 532f5706..b292ccb3 100644
--- a/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java
+++ b/src/main/java/io/github/dsheirer/module/decode/event/MessageActivityPanel.java
@@ -85,7 +85,7 @@ public class MessageActivityPanel extends JPanel implements Listener<ProcessingC
     {
         if(mCurrentMessageHistory != null)
         {
-            mCurrentMessageHistory.addListener(null);
+            mCurrentMessageHistory.removeListener(mMessageModel);
         }
 
         if(processingChain != null)