From c5c97792aec32b7b51f0731cf6756c12022b92d5 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin
Date: Wed, 21 Dec 2016 13:40:46 -0800
Subject: Bug 509614 - Changes made in Compare editor are not saved when the
 left and the right panes are swapped

Change-Id: I2b6e84ec94f62379eef48a699720964b042d5f1d
---
 .../org/eclipse/compare/contentmergeviewer/TextMergeViewer.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index fb265eb7d..a8fb2e16d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -5240,7 +5240,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 		IMergeViewerContentProvider content= getMergeContentProvider();
 		Object leftContent = content.getLeftContent(oldInput);
 
-		if (leftContent != null && getCompareConfiguration().isLeftEditable() && isLeftDirty()) {
+		if (leftContent != null && isLeftEditable() && isLeftDirty()) {
 			if (fLeftContributor.hasSharedDocument(leftContent)) {
 				if (flush(fLeftContributor))
 					setLeftDirty(false);
@@ -5257,7 +5257,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 		IMergeViewerContentProvider content= getMergeContentProvider();
 		Object rightContent = content.getRightContent(oldInput);
 
-		if (rightContent != null && getCompareConfiguration().isRightEditable() && isRightDirty()) {
+		if (rightContent != null && isRightEditable() && isRightDirty()) {
 			if (fRightContributor.hasSharedDocument(rightContent)) {
 				if (flush(fRightContributor))
 					setRightDirty(false);
-- 
cgit v1.2.1