Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Becker2018-04-10 08:19:20 -0400
committerMatthias Becker2018-04-10 08:20:47 -0400
commit8130327f4416d4b951c1daaa60eceb0b793307b5 (patch)
treeb40f11ded0be6730d6ec72942261b40110e8bd73
parent624acf14a605ec6684ed9f55922590043a9e1ffa (diff)
downloadeclipse.platform.team-8130327f4416d4b951c1daaa60eceb0b793307b5.tar.gz
eclipse.platform.team-8130327f4416d4b951c1daaa60eceb0b793307b5.tar.xz
eclipse.platform.team-8130327f4416d4b951c1daaa60eceb0b793307b5.zip
Change-Id: If0199505fefde500a9454e62f8468535c04857af Signed-off-by: Matthias Becker <ma.becker@sap.com>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
index 2887708b1..ff6070ae3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
@@ -563,7 +563,9 @@ public class MergeSourceViewer implements ISelectionChangedListener,
if (c != null) {
c.setEnabled(enabled);
Display d= c.getDisplay();
- c.setBackground(enabled ? d.getSystemColor(SWT.COLOR_LIST_BACKGROUND) : null);
+ if (enabled) {
+ c.setBackground(d.getSystemColor(SWT.COLOR_LIST_BACKGROUND));
+ }
}
}
}

Back to the top