Merge pull request #5273 from aws-lumberyard-dev/Atom/guthadam/material_editor_and_graph_canvas_crash_on_shutdown

Fix material editor crash on shutdown if graph canvas gem is loaded
2021-11-04 09:27:53 -05:00
parent d85a17536b 94110834f3
commit f91ba36665
1 changed files with 4 additions and 0 deletions
@@ -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());