diff --git a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java index 3f1df06c45ff..c65b2e32525f 100644 --- a/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java +++ b/python/src/com/jetbrains/python/debugger/array/AsyncArrayTableModel.java @@ -88,19 +88,6 @@ public class AsyncArrayTableModel extends AbstractTableModel { try { ListenableFuture chunk = myChunkCache.get(key); - chunk.addListener(new Runnable() { - @Override - public void run() { - UIUtil.invokeLaterIfNeeded(new Runnable() { - @Override - public void run() { - fireTableCellUpdated(row, col); - } - }); - } - }, myExecutorService); - - if (chunk.isDone()) { int r = row % CHUNK_ROW_SIZE; int c = col % CHUNK_COL_SIZE; @@ -110,6 +97,18 @@ public class AsyncArrayTableModel extends AbstractTableModel { return myProvider.correctStringValue((String)chunk.get()[r][c]); } } + } else { + chunk.addListener(new Runnable() { + @Override + public void run() { + UIUtil.invokeLaterIfNeeded(new Runnable() { + @Override + public void run() { + fireTableCellUpdated(row, col); + } + }); + } + }, myExecutorService); } return EMPTY_CELL_VALUE; } diff --git a/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java b/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java index 8c787c672fe3..a169fc3d6521 100644 --- a/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java +++ b/python/src/com/jetbrains/python/debugger/array/NumpyArrayTable.java @@ -566,7 +566,6 @@ public class NumpyArrayTable { public void showError(String message) { myDialog.setError(message); - setBusy(false); } public void showInfoHint(final String message) {