From 9f06bffc1b40ac79ccd19b7cfdedfb444fb1151a Mon Sep 17 00:00:00 2001
From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date: Wed, 8 Sep 2021 13:19:03 -0700
Subject: [PATCH] Fix ebus node slots not checked for vars (#3994)

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
---
 .../ScriptCanvas/Libraries/Core/EBusEventHandler.cpp     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
index ef73bb967d..4e2d740656 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp
@@ -78,6 +78,8 @@ namespace ScriptCanvas
                         variableIds.insert(scopedVariableId->m_identifier);
                     }
                 }
+                
+                Node::CollectVariableReferences(variableIds);
             }
 
             bool EBusEventHandler::ContainsReferencesToVariables(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) const
@@ -90,11 +92,14 @@ namespace ScriptCanvas
 
                     if (scopedVariableId)
                     {
-                        return variableIds.find(scopedVariableId->m_identifier) != variableIds.end();
+                        if(variableIds.find(scopedVariableId->m_identifier) != variableIds.end())
+                        {
+                            return true;
+                        }
                     }
                 }
 
-                return false;
+                return Node::ContainsReferencesToVariables(variableIds);
             }
 
             size_t EBusEventHandler::GenerateFingerprint() const