diff --git a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ExportMemoryAction.java b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ExportMemoryAction.java index f2f58d6ffd6..a0994529168 100644 --- a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ExportMemoryAction.java +++ b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ExportMemoryAction.java @@ -123,7 +123,7 @@ public class ExportMemoryAction implements IViewActionDelegate { monitor.beginTask("Transferring Data", jobs.intValue()); BigInteger jobCount = BigInteger.ZERO; - while(transferAddress.compareTo(endAddress) < 0) + while(transferAddress.compareTo(endAddress) < 0 && !monitor.isCanceled()) { BigInteger length = DATA_PER_RECORD; if(endAddress.subtract(transferAddress).compareTo(length) < 0) diff --git a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ImportMemoryAction.java b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ImportMemoryAction.java index 7475c234e91..0f20900cd0c 100644 --- a/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ImportMemoryAction.java +++ b/plugins/org.eclipse.dd.debug.memory.renderings.traditional/src/org/eclipse/dd/debug/memory/renderings/actions/ImportMemoryAction.java @@ -129,7 +129,7 @@ public class ImportMemoryAction implements IViewActionDelegate { BigInteger jobCount = BigInteger.ZERO; String line = reader.readLine(); - while(line != null) + while(line != null && !monitor.isCanceled()) { String recordType = line.substring(0, 2); int recordCount = Integer.parseInt(line.substring(2, 4), 16);