Merge pull request #687 from csmith/master

Fix counting of events.
DMDirc · Mar 13, 2016 · 3836da6 · 3836da6
2 parents abf98ac + 7dcdd5b
commit 3836da6
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/com/dmdirc/ui/messages/UnreadStatusManager.java b/src/com/dmdirc/ui/messages/UnreadStatusManager.java
@@ -27,6 +27,7 @@
 import com.dmdirc.events.BaseChannelTextEvent;
 import com.dmdirc.events.BaseQueryTextEvent;
 import com.dmdirc.events.ChannelHighlightEvent;
+import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryHighlightEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
@@ -61,39 +62,44 @@ public UnreadStatusManager(final WindowModel container) {
 
     @Handler
     public void handleDisplayableEvent(final DisplayableEvent event) {
-        if (event.getSource().equals(container)) {
+        if (includeEvent(event)) {
             updateStatus(miscellaneousColour, unreadLines + 1);
         }
     }
 
     @Handler
     public void handleChannelTextEvent(final BaseChannelTextEvent event) {
-        if (event.getSource().equals(container)) {
+        if (includeEvent(event)) {
             updateStatus(messageColour);
         }
     }
 
     @Handler
     public void handleQueryTextEvent(final BaseQueryTextEvent event) {
-        if (event.getSource().equals(container)) {
+        if (includeEvent(event)) {
             updateStatus(messageColour);
         }
     }
 
     @Handler
     public void handleChannelHighlightEvent(final ChannelHighlightEvent event) {
-        if (event.getChannel().equals(container)) {
+        if (includeEvent(event)) {
             updateStatus(highlightColour);
         }
     }
 
     @Handler
     public void handleQueryHighlightEvent(final QueryHighlightEvent event) {
-        if (event.getQuery().equals(container)) {
+        if (includeEvent(event)) {
             updateStatus(highlightColour);
         }
     }
 
+    private boolean includeEvent(final DisplayableEvent event) {
+        return event.getSource().equals(container)
+                && !event.getDisplayProperty(DisplayProperty.DO_NOT_DISPLAY).orElse(false);
+    }
+
     public int getUnreadLines() {
         return unreadLines;
     }