From ba119c0a8a91f652524647e4106fb2fa9b961c1a Mon Sep 17 00:00:00 2001
From: Uwe Stieber
Date: Thu, 23 Feb 2012 18:01:12 +0100
Subject: Target Explorer: Fix mysterious "Widget Disposed" exceptions with a
 second root common navigator content contribution

---
 .../tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java
index 8952dd720..4276d9029 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/src/org/eclipse/tcf/te/ui/views/workingsets/WorkingSetsContentProvider.java
@@ -95,7 +95,7 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
 		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 			if (SHOW_TOP_LEVEL_WORKING_SETS.equals(event.getProperty())) {
-				updateRootMode();
+				updateRootMode(true);
 			}
 		}
 	};
@@ -137,7 +137,7 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
 		extensionStateModel = config.getExtensionStateModel();
 		extensionStateModel.addPropertyChangeListener(rootModeListener);
 
-		updateRootMode();
+		updateRootMode(false);
 	}
 
 	/* (non-Javadoc)
@@ -302,7 +302,7 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
 	/**
 	 * Update the common navigator root mode.
 	 */
-	private void updateRootMode() {
+	private void updateRootMode(boolean updateInput) {
 		CommonNavigator navigator = viewer.getCommonNavigator();
 		if (navigator == null) return;
 
@@ -319,7 +319,7 @@ public class WorkingSetsContentProvider implements ICommonContentProvider {
 			filterActive = false;
 		}
 
-		if (!newInput.equals(viewer.getInput())) {
+		if (updateInput && !newInput.equals(viewer.getInput())) {
 			viewer.setInput(newInput);
 		}
 		setFilterActive(filterActive);
-- 
cgit v1.2.3