Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2008-03-15 21:38:53 -0400
committerslewis2008-03-15 21:38:53 -0400
commitba309f151f8b8b1f5e5ffe3ff20e0e31731e69bb (patch)
treea48dd01ef7ec96e21c0d15d480ad00e95ea463f3
parent857c8329a6811c59ccfe180699fd25a375382d56 (diff)
downloadorg.eclipse.ecf-ba309f151f8b8b1f5e5ffe3ff20e0e31731e69bb.tar.gz
org.eclipse.ecf-ba309f151f8b8b1f5e5ffe3ff20e0e31731e69bb.tar.xz
org.eclipse.ecf-ba309f151f8b8b1f5e5ffe3ff20e0e31731e69bb.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=222864
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java
index 4f2449472..26584c99c 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java
@@ -772,7 +772,7 @@ public class ChatRoomManagerView extends ViewPart implements IChatRoomInvitation
itemSelected = (CTabItem) e.item;
if (itemSelected == chatRoomTab.tabItem)
makeTabItemNormal();
- if (itemSelected == rootChannelTab.tabItem)
+ if (rootChannelTab != null && itemSelected == rootChannelTab.tabItem)
rootChannelTab.makeTabItemNormal();
}
});
@@ -1112,7 +1112,8 @@ public class ChatRoomManagerView extends ViewPart implements IChatRoomInvitation
handleTextInput(inputText.getText());
clearInput();
scrollToEnd(getRootTextOutput());
- rootChannelTab.makeTabItemNormal();
+ if (rootChannelTab != null)
+ rootChannelTab.makeTabItemNormal();
}
protected void handleKeyPressed(KeyEvent evt) {
@@ -1200,9 +1201,10 @@ public class ChatRoomManagerView extends ViewPart implements IChatRoomInvitation
public void run() {
if (rootDisposed)
return;
- appendText(rootChannelTab, getRootTextOutput(), new ChatLine(messageBody, new ChatRoomParticipant(fromID)));
- if (rootChannelTab != null)
+ if (rootChannelTab != null) {
+ appendText(rootChannelTab, getRootTextOutput(), new ChatLine(messageBody, new ChatRoomParticipant(fromID)));
rootChannelTab.makeTabItemBold();
+ }
}
});
}

Back to the top