diff --git a/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValueExecutionService.java b/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValueExecutionService.java index fb561be01af2..cf71ee66c6ba 100644 --- a/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValueExecutionService.java +++ b/python/pydevSrc/com/jetbrains/python/debugger/PyDebugValueExecutionService.java @@ -54,13 +54,15 @@ public final class PyDebugValueExecutionService { public synchronized void cancelSubmittedTasks(@NotNull PyFrameAccessor frameAccessor) { int i = myFrameAccessors.indexOf(frameAccessor); - List submittedTasks = mySubmittedTasks.get(i); - for (Future task : submittedTasks) { - if (!task.isDone()) { - task.cancel(true); + if (i != -1) { + List submittedTasks = mySubmittedTasks.get(i); + for (Future task : submittedTasks) { + if (!task.isDone()) { + task.cancel(true); + } } + submittedTasks.clear(); } - submittedTasks.clear(); } public synchronized void sessionStopped(@NotNull PyFrameAccessor frameAccessor) {