From eb6d586a928d1c4e188c5ff388dda54b3d6f55fa Mon Sep 17 00:00:00 2001 From: pereslav Date: Tue, 13 Apr 2021 15:29:35 +0100 Subject: [PATCH 1/3] Test file. Will be deleted --- Gems/Multiplayer/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Gems/Multiplayer/test.txt diff --git a/Gems/Multiplayer/test.txt b/Gems/Multiplayer/test.txt new file mode 100644 index 0000000000..9daeafb986 --- /dev/null +++ b/Gems/Multiplayer/test.txt @@ -0,0 +1 @@ +test From b68d07ff8838d67c9386c3954eea09575777b856 Mon Sep 17 00:00:00 2001 From: pereslav Date: Tue, 13 Apr 2021 16:17:42 +0100 Subject: [PATCH 2/3] Deleted temp test file --- Gems/Multiplayer/test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Gems/Multiplayer/test.txt diff --git a/Gems/Multiplayer/test.txt b/Gems/Multiplayer/test.txt deleted file mode 100644 index 9daeafb986..0000000000 --- a/Gems/Multiplayer/test.txt +++ /dev/null @@ -1 +0,0 @@ -test From 59252235d5eae7e5ad0eb9d3403e9b737089e2db Mon Sep 17 00:00:00 2001 From: pereslav Date: Wed, 14 Apr 2021 13:13:01 +0100 Subject: [PATCH 3/3] Fixed dangling pointer in InitializeCatalog --- Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp index 7cb0090ef5..e01b105d13 100644 --- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp +++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp @@ -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()); }); } }