Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline

Fixed dangling pointer in InitializeCatalog
2021-04-14 22:59:39 +01:00
parent 4a3d24f189 59252235d5
commit 828bedf7a9
1 changed files with 2 additions and 2 deletions
@@ -617,9 +617,9 @@ namespace AzFramework
            // won't free the mutex until the load is complete.
            // So instead, queue the notification until the next tick, so that it doesn't occur within the AssetCatalogRequestBus mutex, and also
            // so that the entire AssetCatalog initialization is complete.
-            AZ::TickBus::QueueFunction([catalogRegistryFile]()
+            AZ::TickBus::QueueFunction([catalogRegistryString = AZStd::string(catalogRegistryFile)]()
                {
-                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryFile);
+                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryString.c_str());
                });
        }
    }