Bug 494764 - MemoryRetrievalProxy listener isn't added when opening
MemoryView with no active debug session
Change-Id: I4203f6c4b1cdb8db7c0d26047ce1e0b67ee8f9d2
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
index 9ae970c..8965a6f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2013 IBM Corporation and others.
+ * Copyright (c) 2004, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -264,7 +264,7 @@
if (obj instanceof IAdaptable) {
IAdaptable context = (IAdaptable) obj;
IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context);
- if (retrieval != null && retrieval != fRetrieval && fTreeViewer != null && fTreeViewer.getContentProvider() != null) {
+ if (retrieval != null && (retrieval != fRetrieval || retrieval != fTreeViewer.getInput()) && fTreeViewer != null && fTreeViewer.getContentProvider() != null) {
// set new setting
fRetrieval = retrieval;
fTreeViewer.setInput(fRetrieval);
