From 0af614ad6ce68457583dac155333036d3e63ed16 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Mon, 9 Aug 2010 18:46:28 +0400 Subject: [PATCH] LH: check for project disposal in dialogs --- .../history/integration/ui/views/HistoryDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java index d5560002573f..811099e6d5bc 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java @@ -264,8 +264,12 @@ public abstract class HistoryDialog extends FrameW } public void run() { + if (myProject.isDisposed()) return; + invokeAndWait(new Runnable() { public void run() { + if (myProject.isDisposed()) return; + isUpdating = true; updateActions(); myDiffView.startUpdating(); @@ -283,7 +287,7 @@ public abstract class HistoryDialog extends FrameW final Runnable finalApply = apply; invokeAndWait(new Runnable() { public void run() { - if (isDisposed()) return; + if (myProject.isDisposed()) return; isUpdating = false; if (finalApply != null) {