Merge pull request #378 from csmith/master

Fix silly NPE in InviteLabel.
DMDirc · Jan 19, 2015 · e89a027 · e89a027
2 parents c181364 + dccdf29
commit e89a027
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java b/ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java
@@ -163,7 +163,7 @@ public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             activeConnection = event.getWindow().get().getContainer().getConnection();
         } else {
-            activeConnection = null;
+            activeConnection = Optional.empty();
         }
         update();
     }