Synchronise selection events.

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

 import javax.inject.Singleton;
 
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
 
 /**
  * Manages the lifecycle of the lag display plugin.
         return showLabels;
     }
 
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             final Optional<Connection> connection = event.getWindow().get().getContainer()

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

         }
     }
 
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             activeConnection = event.getWindow().get().getContainer().getConnection();

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

 import javax.swing.tree.TreeSelectionModel;
 
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
 
 /**
  * A Window manager to handle ctrl[+shift]+tab switching between windows.
         treeScroller.changeFocus(false);
     }
 
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             final TreeNode[] path = model.getPathToRoot(nodes.get(event.getWindow().get()));

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.swing.JComponent;
         });
     }
 
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             UIUtilities.invokeLater(() -> {

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowSelectionFontChanger.java

 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 
 import java.awt.Font;
-import java.util.Optional;
 
 import javax.swing.JComponent;
 import javax.swing.UIManager;
 
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
 import net.engio.mbassy.listener.Listener;
 import net.engio.mbassy.listener.References;
 
         selectionChanged(new SwingWindowSelectedEvent(activeFrameMaanger.getActiveFrame()));
     }
 
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         // TODO: Check children and set italic
         if (event.getWindow().isPresent() && window.equals(event.getWindow().get())) {

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

 import com.dmdirc.Query;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.PluginDomain;
 
-import java.util.concurrent.Callable;
-
 import javax.inject.Inject;
 
 import net.engio.mbassy.listener.Handler;
-import net.engio.mbassy.listener.Invoke;
 
 /**
  * Displays information related to the current window in the status bar.
         panel = null;
     }
 
-    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             updateStatus(event.getWindow().get().getContainer());