remove model listeners on unmap all + fix to selection change

1 files changed, 5 insertions, 3 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java
index 9e42acfe6..8ce203dca 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java
@@ -166,6 +166,9 @@ public abstract class AsynchronousViewer extends StructuredViewer {
 	        Iterator updatePolicies = fModelProxies.values().iterator();
 	        while (updatePolicies.hasNext()) {
 	            IModelProxy proxy = (IModelProxy)updatePolicies.next();
+	            if (fUpdatePolicy instanceof IModelChangedListener) {
+					proxy.removeModelChangedListener((IModelChangedListener)fUpdatePolicy);
+				}	            
 	            proxy.dispose();
 	        }
 	        
@@ -439,7 +442,6 @@ public abstract class AsynchronousViewer extends StructuredViewer {
 				if (fUpdatePolicy instanceof IModelChangedListener) {
 					proxy.removeModelChangedListener((IModelChangedListener)fUpdatePolicy);
 				}
-				
 				proxy.dispose();
 			}
 		}
@@ -731,7 +733,7 @@ public abstract class AsynchronousViewer extends StructuredViewer {
 			if (isSuppressEqualSelections() && currentSelection.equals(fCurrentSelection)) {
 				return;
 			}
-			updateSelection(fCurrentSelection);
+			updateSelection(currentSelection);
 		}
 	}
 	
@@ -880,8 +882,8 @@ public abstract class AsynchronousViewer extends StructuredViewer {
 	 * @see org.eclipse.jface.viewers.StructuredViewer#updateSelection(org.eclipse.jface.viewers.ISelection)
 	 */
 	protected synchronized void updateSelection(ISelection selection) {
-		super.updateSelection(selection);
 		fCurrentSelection = selection;
+		super.updateSelection(selection);
 	}