From 94110834f38ebdb25783d95e22031c28e53cd519 Mon Sep 17 00:00:00 2001
From: Guthrie Adams <guthadam@amazon.com>
Date: Wed, 3 Nov 2021 15:47:11 -0500
Subject: [PATCH] Fix material editor crash on shutdown if graph canvas gem is
 loaded

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
---
 .../Code/Source/Translation/TranslationBuilder.cpp            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
index bac58c3ba1..1b01f7885d 100644
--- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
+++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp
@@ -40,10 +40,14 @@ namespace GraphCanvas
         {
             AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType);
         }
+
+        AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusConnect(GetUUID());
     }
 
     void TranslationAssetWorker::Deactivate()
     {
+        AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusDisconnect();
+
         if (AZ::Data::AssetManager::Instance().GetHandler(AZ::Data::AssetType{ azrtti_typeid<TranslationAsset>() }))
         {
             AZ::Data::AssetManager::Instance().UnregisterHandler(m_assetHandler.get());