From 4a7088a1c1b19ea8284c8384305049d821438ed6 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Wed, 19 Apr 2017 11:26:12 +0100
Subject: [PATCH] Bug 515430: Prevent assertion by checking for quick fixable
 set

Change-Id: Iea8ac8354b104cb272457b78d2bf1304bd69e065
---
 .../org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
index b235b1b1744..afefc1a5972 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
@@ -546,7 +546,8 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 		private void setOverlay(Object value, ProblemAnnotation problemAnnotation) {
 			if (value instanceof CMarkerAnnotation) {
 				CMarkerAnnotation annotation= (CMarkerAnnotation) value;
-				if (annotation.isProblem() && !annotation.isQuickFixable()) {
+				if (annotation.isProblem()
+						&& (!annotation.isQuickFixableStateSet() || !annotation.isQuickFixable())) {
 					annotation.setOverlay(problemAnnotation);
 					fPreviouslyOverlaid.remove(annotation);
 					fCurrentlyOverlaid.add(annotation);