Merge pull request #783 from csmith/master

Fix a couple of issues with closing channels.
DMDirc · Jan 14, 2017 · b19ad5e · b19ad5e
2 parents f4cde27 + e1019d6
commit b19ad5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/dmdirc/GroupChatManagerImpl.java b/src/main/java/com/dmdirc/GroupChatManagerImpl.java
@@ -189,7 +189,7 @@ public void handleConnected() {
 
     @Handler
     void handleChannelClosing(final ChannelClosedEvent event) {
-        if (event.getChannel().getConnection().equals(connection)) {
+        if (connection.equals(event.getChannel().getConnection().orElse(null))) {
             final GroupChat channel = event.getChannel();
             connection.getWindowModel().getInputModel().get().getTabCompleter()
                     .removeEntry(TabCompletionType.CHANNEL, channel.getName());

diff --git a/src/main/java/com/dmdirc/Server.java b/src/main/java/com/dmdirc/Server.java
@@ -205,6 +205,7 @@ public Server(
 
         highlightManager = new HighlightManager(windowModel);
         windowModel.getEventBus().subscribe(highlightManager);
+        windowModel.getEventBus().subscribe(groupChatManager);
         windowModel.getEventBus().subscribe(this);
     }
 
@@ -675,6 +676,7 @@ private void handleClose(final FrameClosingEvent event) {
             synchronized (myStateLock) {
                 eventHandler.unregisterCallbacks();
                 windowModel.getConfigManager().removeListener(configListener);
+                windowModel.getEventBus().unsubscribe(groupChatManager);
                 windowModel.getEventBus().unsubscribe(highlightManager);
                 executorService.shutdown();