From 75933ff7fd51fcbc94feb08f1c0fffaccba670f0 Mon Sep 17 00:00:00 2001
From: chcurran <82187351+carlitosan@users.noreply.github.com>
Date: Tue, 6 Jul 2021 21:03:31 -0700
Subject: [PATCH] The Great ScriptCanvas Purge, Part VII

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
---
 .../Code/Include/ScriptCanvas/Core/Connection.cpp          | 7 ++++++-
 .../Code/Include/ScriptCanvas/Core/Connection.h            | 2 --
 .../Include/ScriptCanvas/Libraries/Core/GetVariable.cpp    | 2 +-
 .../Include/ScriptCanvas/Libraries/Core/SetVariable.cpp    | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
index 2a2c055416..d97a208064 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.cpp
@@ -168,7 +168,12 @@ namespace ScriptCanvas
     {
         if (nodeId == m_sourceEndpoint.GetNodeId() || nodeId == m_targetEndpoint.GetNodeId())
         {
-            GraphRequestBus::Event(*GraphNotificationBus::GetCurrentBusId(), &GraphRequests::DisconnectById, GetEntityId());
+            Slot* sourceSlot{};
+            NodeRequestBus::EventResult(sourceSlot, m_sourceEndpoint.GetNodeId(), &NodeRequests::GetSlot, m_sourceEndpoint.GetSlotId());
+            if (sourceSlot)
+            {
+                GraphRequestBus::Event(sourceSlot->GetNode()->GetOwningScriptCanvasId(), &GraphRequests::DisconnectById, GetEntityId());
+            }
         }
     }
 }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
index 1a1c47794b..79a73b6f19 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Connection.h
@@ -60,8 +60,6 @@ namespace ScriptCanvas
         // GraphNotificationBus
         void OnNodeRemoved(const ID& nodeId) override;
 
-        void UpdateConnectionStatus(NodeUpdateSlotReport& report);
-
     protected:
         //-------------------------------------------------------------------------
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
index 43fc8ed54b..fb6d2f21e7 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/GetVariable.cpp
@@ -288,7 +288,7 @@ namespace ScriptCanvas
                     VariableRequestBus::EventResult(baseType, GetScopedVariableId(), &VariableRequests::GetType);
 
                     const GraphVariableMapping* variableMap = nullptr;
-                    GraphRequestBus::EventResult(variableMap, *GraphNotificationBus::GetCurrentBusId(), &GraphRequests::GetVariables);
+                    GraphRequestBus::EventResult(variableMap, GetOwningScriptCanvasId(), &GraphRequests::GetVariables);
                                         
                     if (variableMap && baseType.IsValid())
                     {
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
index 25a73bc7ce..6d6260aabe 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/SetVariable.cpp
@@ -243,7 +243,7 @@ namespace ScriptCanvas
                     VariableRequestBus::EventResult(baseType, GetScopedVariableId(), &VariableRequests::GetType);
 
                     const GraphVariableMapping* variableMap = nullptr;
-                    GraphRequestBus::EventResult(variableMap, *GraphNotificationBus::GetCurrentBusId(), &GraphRequests::GetVariables);
+                    GraphRequestBus::EventResult(variableMap, GetOwningScriptCanvasId(), &GraphRequests::GetVariables);
 
                     if (variableMap && baseType.IsValid())
                     {