# HG changeset patch
# User timkelly
# Date 1283182401 18000
# Node ID 8b428a8a3473adbea63876da31670cc9b434444c
# Parent  8eeb96baf835c6976c8529820056f03b8a9fff58# Parent  6f11f5393a5c74dfb38470bd7cfc57a512b81103
merge commit

diff -r 6f11f5393a5c -r 8b428a8a3473 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Fri Aug 27 16:34:38 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Mon Aug 30 10:33:21 2010 -0500
@@ -194,7 +194,9 @@
 	private void refreshViewer() {
 		Display.getDefault().asyncExec(new Runnable() {
 			public void run() {
-				if (nameEditor != null && nameEditor.isActivated()) {
+				if (nameEditor != null && nameEditor.getControl() != null &&
+					!nameEditor.getControl().isDisposed() &&
+					nameEditor.isActivated()) {
 					refreshPending = true;
 					return;
 				}