From bf17c7cf93b870d2167ed5f044a0caf5805802eb Mon Sep 17 00:00:00 2001
From: James <49045138+ghidracadabra@users.noreply.github.com>
Date: Wed, 15 Nov 2023 18:24:36 +0000
Subject: [PATCH] GP-4006 initial commit

---
 .../decompiler/component/DecompilerCodeComparisonPanel.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
index 940214d382..1e1046f34a 100644
--- a/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
+++ b/Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/component/DecompilerCodeComparisonPanel.java
@@ -440,7 +440,10 @@ public abstract class DecompilerCodeComparisonPanel<T extends DualDecompilerFiel
 		}
 
 		// Kick the tool so action buttons will be updated
-		tool.getActiveComponentProvider().contextChanged();
+		ComponentProvider provider = tool.getWindowManager().getProvider(comp);
+		if (provider != null) {
+			provider.contextChanged();
+		}
 	}
 
 	private void setDualPanelFocus(int leftOrRight) {