From 97ef45a2bbd5cb00a61dd0760c15609167d30cbe Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Thu, 27 Apr 2023 14:29:00 -0400
Subject: [PATCH] GP-3358: Fix for DO_OBJECT_RESTORED post GP-3084

---
 .../java/ghidra/trace/model/TypedEventDispatcher.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/TypedEventDispatcher.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/TypedEventDispatcher.java
index c3ba4cef2d..d7da50b009 100644
--- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/TypedEventDispatcher.java
+++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/TypedEventDispatcher.java
@@ -168,8 +168,12 @@ public class TypedEventDispatcher {
 	public void handleChangeRecord(DomainObjectChangeRecord rec) {
 		//String typeName = DefaultTraceChangeType.getName(rec.getEventType());
 		//CountsByType.compute(typeName, (k, v) -> v == null ? 1 : v + 1);
-		if (rec instanceof TraceChangeRecord) {
-			handleTraceChangeRecord((TraceChangeRecord<?, ?>) rec);
+		if (rec.getEventType() == DomainObject.DO_OBJECT_RESTORED && restoredHandler != null) {
+			restoredHandler.accept(rec);
+			return;
+		}
+		if (rec instanceof TraceChangeRecord<?, ?> cr) {
+			handleTraceChangeRecord(cr);
 			return;
 		}
 		Consumer<DomainObjectChangeRecord> handler;