From a4e443c9cd9c77054755420faf6ab84899cd9b77 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <aleksey.pivovarov@jetbrains.com>
Date: Tue, 31 May 2016 15:04:45 +0300
Subject: [PATCH] EA-82849 - TDDE: TraceableDisposable.throwDisposalError

---
 .../com/intellij/openapi/diff/impl/util/SyncScrollSupport.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
index 3bc3e90b81b3..bb6e3d510e9a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/SyncScrollSupport.java
@@ -151,6 +151,7 @@ public class SyncScrollSupport implements Disposable {
     Editor slave = sidesContainer.getEditor(masterSide.otherSide());
 
     if (master == null || slave == null) return;
+    if (master.isDisposed() || slave.isDisposed()) return;
 
     int masterVerticalScrollOffset = master.getScrollingModel().getVerticalScrollOffset();
     int slaveVerticalScrollOffset = slave.getScrollingModel().getVerticalScrollOffset();