Browse Source

Don't hold locks when firing server_connected actions, as it causes deadlocks.

Fixes issue 2581.
tags/0.6.3m1rc1
Chris Smith 15 years ago
parent
commit
34c126db80
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/com/dmdirc/Server.java

+ 2
- 2
src/com/dmdirc/Server.java View File

@@ -1351,8 +1351,6 @@ public class Server extends WritableFrameContainer implements Serializable {
1351 1351
 
1352 1352
             converter = parser.getIRCStringConverter();
1353 1353
 
1354
-            ActionManager.processEvent(CoreActionType.SERVER_CONNECTED, null, this);
1355
-
1356 1354
             if (getConfigManager().getOptionBool(DOMAIN_GENERAL, "rejoinchannels")) {
1357 1355
                 for (Channel chan : channels.values()) {
1358 1356
                     chan.join();
@@ -1365,6 +1363,8 @@ public class Server extends WritableFrameContainer implements Serializable {
1365 1363
 
1366 1364
             checkModeAliases();
1367 1365
         }
1366
+
1367
+        ActionManager.processEvent(CoreActionType.SERVER_CONNECTED, null, this);
1368 1368
     }
1369 1369
 
1370 1370
     /**

Loading…
Cancel
Save