1 files changed, 21 insertions, 5 deletions
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index f9af23faea8..f7ae2945471 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -103,7 +103,13 @@ void **g_highlightedNodesRead;
 
 void COM_startReadHighlights()
 {
-	if (g_highlightedNodesRead) {
+	if (!g_highlightInitialized)
+	{
+		return;
+	}
+	
+	if (g_highlightedNodesRead) 
+	{
 		MEM_freeN(g_highlightedNodesRead);
 	}
 	
@@ -114,6 +120,11 @@ void COM_startReadHighlights()
 
 int COM_isHighlightedbNode(bNode *bnode)
 {
+	if (!g_highlightInitialized)
+	{
+		return false;
+	}
+	
 	if (!g_highlightedNodesRead) {
 		return false;
 	}
@@ -397,13 +408,18 @@ void WorkScheduler::deinitialize()
 
 	/* deinitialize highlighting */
 	if (g_highlightInitialized) {
-		if (g_highlightedNodes)
+		g_highlightInitialized = false;
+		if (g_highlightedNodes) 
+		{
 			MEM_freeN(g_highlightedNodes);
+			g_highlightedNodes = NULL;
+		}
 
-		if (g_highlightedNodesRead)
+		if (g_highlightedNodesRead) 
+		{
 			MEM_freeN(g_highlightedNodesRead);
-
-		g_highlightInitialized = false;
+			g_highlightedNodesRead = NULL;
+		}
 	}
 }