Skip to main content
summaryrefslogtreecommitdiffstats
path: root/dsf
diff options
context:
space:
mode:
authorPatrick Chuong2011-05-06 10:00:24 -0400
committerPatrick Chuong2011-05-06 10:00:24 -0400
commitb95696553935565701510cae039ab333aa1e0ef4 (patch)
treeb9daa1dad1ddf99d8f43b5c9d4572a3a71cf0732 /dsf
parentf7a9c21d2e59e0d3c24888780ed0091096e881b1 (diff)
downloadorg.eclipse.cdt-b95696553935565701510cae039ab333aa1e0ef4.tar.gz
org.eclipse.cdt-b95696553935565701510cae039ab333aa1e0ef4.tar.xz
org.eclipse.cdt-b95696553935565701510cae039ab333aa1e0ef4.zip
Bug 344842 - [disassembly] NPE when shutting down the workbench
Diffstat (limited to 'dsf')
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
index f613f655fc..be6f711096 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java
@@ -738,6 +738,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
*/
@Override
public void dispose() {
+ fUpdateCount++;
IWorkbenchPartSite site = getSite();
site.setSelectionProvider(null);
site.getPage().removePartListener(fPartListener);
@@ -1890,6 +1891,9 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem
}
private void startUpdate(final Runnable update) {
+ if (fViewer == null)
+ return;
+
final int updateCount = fUpdateCount;
final SafeRunnable safeUpdate = new SafeRunnable() {
public void run() {

Back to the top