浏览代码

Potential NPE fix in Channel

git-svn-id: http://svn.dmdirc.com/trunk@2490 00569f92-eb28-0410-84fd-f71c24880f
tags/0.5.5
Chris Smith 16 年前
父节点
当前提交
84eb1e4831
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5
    3
      src/com/dmdirc/Channel.java

+ 5
- 3
src/com/dmdirc/Channel.java 查看文件

360
      * @param shouldRemove Whether we should remove the window from the server
360
      * @param shouldRemove Whether we should remove the window from the server
361
      */
361
      */
362
     public void closeWindow(final boolean shouldRemove) {
362
     public void closeWindow(final boolean shouldRemove) {
363
-        final CallbackManager callbackManager = server.getParser().getCallbackManager();
363
+        if (server.getParser() != null) {
364
+            final CallbackManager callbackManager = server.getParser().getCallbackManager();
364
         
365
         
365
-        for (String callback : CALLBACKS) {
366
-            callbackManager.delCallback(callback, this);
366
+            for (String callback : CALLBACKS) {
367
+                callbackManager.delCallback(callback, this);
368
+            }
367
         }
369
         }
368
         
370
         
369
         ActionManager.processEvent(CoreActionType.CHANNEL_CLOSED, null, this);
371
         ActionManager.processEvent(CoreActionType.CHANNEL_CLOSED, null, this);

正在加载...
取消
保存