Fixed NPE, invalid thread access.

2 files changed, 17 insertions, 10 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatWindow.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatWindow.java
index 5dacf214b..10608d72d 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatWindow.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ChatWindow.java
@@ -55,7 +55,7 @@ public class ChatWindow extends ApplicationWindow {
 	private final Runnable flipImage = new Runnable() {
 		public void run() {
 			Shell shell = getShell();
-			if (!shell.isDisposed()) 
+			if (shell != null && !shell.isDisposed()) 
 				if (blank == shell.getImage()) {
 					if (image != null && !image.isDisposed())
 						shell.setImage(image);
@@ -67,12 +67,13 @@ public class ChatWindow extends ApplicationWindow {
 	};
 
 	private final Runnable showImageRunnable = new Runnable() {
-		public void run() {
-			Shell shell = getShell();
-			if (!shell.isDisposed() && image != null && !image.isDisposed())
-				shell.setImage(image);
-		}
-	};
+        public void run() {
+            Shell shell = getShell();
+            if (shell != null && !shell.isDisposed() && image != null
+                    && !image.isDisposed())
+                shell.setImage(image);
+        }
+    };
 
 	private Flash flash;
 
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
index 69fdc8775..6e0e5b54c 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/LineChatClientView.java
@@ -210,16 +210,22 @@ public class LineChatClientView implements FileSenderUI {
 
 	public void disposeClient() {
 		myNames.clear();
-		view.disposeClient(this);
 		if (teamChat != null) {
-			if (teamChat.chatWindow != null)
-				teamChat.chatWindow.close();
+            final ChatWindow chatWindow = teamChat.chatWindow; 
+			if (chatWindow != null) {
+                Display.getDefault().syncExec(new Runnable() {
+                    public void run() {
+                        chatWindow.close();
+                    }
+                });
+            }
 
 			teamChat = null;
 		}
 		if (lch != null) {
 			lch = null;
 		}
+        view.disposeClient(this);
 	}
 
 	protected void expandAll() {