From c8b501e31da207f747672db762e5acb510c96a9b Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 20 May 2015 16:54:13 +0300
Subject: [PATCH] diff: abort scheduled tasks on rediff

viewer.scheduleRediff();
viewer.rediff();

shouldn't cause performing calculations twice
---
 .../src/com/intellij/diff/tools/util/base/DiffViewerBase.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
index e519314f7079..c897e28e9a06 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
@@ -127,6 +127,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
   @CalledInAwt
   public final void rediff(boolean trySync) {
     if (isDisposed()) return;
+    abortRediff();
 
     onBeforeRediff();