don't reset MemoryRegionsModel when only resetting single asset

src/data/context/GameAssets.cpp

@@ -146,6 +146,8 @@ void GameAssets::ReloadAssets(const std::vector<ra::data::models::AssetModelBase
         return;
     }
 
+    auto* pMemoryRegions = FindMemoryRegions();
+
     std::vector<ra::data::models::AssetModelBase*> vRemainingAssetsToReload(vAssetsToReload);
     const bool bReloadAll = vAssetsToReload.empty();
     if (bReloadAll)
@@ -180,11 +182,12 @@ void GameAssets::ReloadAssets(const std::vector<ra::data::models::AssetModelBase
                 vRemainingAssetsToReload.push_back(&pAsset);
             }
         }
-    }
 
-    auto* pMemoryRegions = FindMemoryRegions();
-    if (pMemoryRegions)
-        pMemoryRegions->ResetCustomRegions();
+        // memory regions are only refreshed when reloading all.
+        // to prevent duplicate entries, clear out the existing ones.
+        if (pMemoryRegions)
+            pMemoryRegions->ResetCustomRegions();
+    }
 
     std::string sLine;
     pData->GetLine(sLine); // version used to create the file

tests/data/context/GameAssets_Tests.cpp

@@ -178,6 +178,19 @@ TEST_CLASS(GameAssets_Tests)
         {
             return *(dynamic_cast<ra::data::models::RichPresenceModel*>(FindAsset(ra::data::models::AssetType::RichPresence, 0)));
         }
+
+        void AddMemoryRegionsModel()
+        {
+            auto pMemoryRegions = std::make_unique<ra::data::models::MemoryRegionsModel>();
+            pMemoryRegions->CreateServerCheckpoint();
+            pMemoryRegions->CreateLocalCheckpoint();
+            Append(std::move(pMemoryRegions));
+        }
+
+        ra::data::models::MemoryRegionsModel& GetMemoryRegions()
+        {
+            return *(dynamic_cast<ra::data::models::MemoryRegionsModel*>(FindAsset(ra::data::models::AssetType::MemoryRegions, 0)));
+        }
     };
 
     TEST_METHOD(TestSaveLocalEmpty)
@@ -673,6 +686,64 @@ TEST_CLASS(GameAssets_Tests)
         Assert::IsNull(gameAssets.FindAchievement(GameAssets::FirstLocalId));
     }
 
+    TEST_METHOD(TestReloadIgnoresMemoryRegions)
+    {
+        GameAssetsHarness gameAssets;
+        gameAssets.AddThreeAchievements();
+        gameAssets.AddMemoryRegionsModel();
+
+        auto& pMemoryRegions = gameAssets.GetMemoryRegions();
+        pMemoryRegions.AddCustomRegion(0x1000, 0x10FF, L"Custom");
+        Assert::AreEqual({ 1U }, pMemoryRegions.CustomRegions().size());
+
+        gameAssets.MockUserFileContents(
+            "1:\"0xH1234=0\":Test:::::User:0:0:0:::00000\n"
+            "3:\"0xH2345=0\":Test2:::::User:0:0:0:::00000\n"
+        );
+
+        gameAssets.ReloadAsset(AssetType::Achievement, 1);
+
+        // item 1 should have been updated from file
+        const auto* pAsset = gameAssets.FindAchievement({ 1U });
+        Assert::IsNotNull(pAsset);
+        Ensures(pAsset != nullptr);
+        Assert::AreEqual(std::string("0xH1234=0"), pAsset->GetTrigger());
+        Assert::AreEqual(AssetCategory::Core, pAsset->GetCategory());
+        Assert::AreEqual(AssetChanges::Unpublished, pAsset->GetChanges());
+
+        // memory regions should not have been modified
+        Assert::AreEqual({ 1U }, pMemoryRegions.CustomRegions().size());
+    }
+
+    TEST_METHOD(TestReloadAllPicksUpMemoryRegions)
+    {
+        GameAssetsHarness gameAssets;
+        gameAssets.AddThreeAchievements();
+        gameAssets.AddMemoryRegionsModel();
+
+        const auto& pMemoryRegions = gameAssets.GetMemoryRegions();
+        Assert::AreEqual({ 0U }, pMemoryRegions.CustomRegions().size());
+
+        gameAssets.MockUserFileContents(
+            "1:\"0xH1234=0\":Test:::::User:0:0:0:::00000\n"
+            "3:\"0xH2345=0\":Test2:::::User:0:0:0:::00000\n"
+            "M0:0x1000-0x10FF:\"Custom\"\n"
+        );
+
+        gameAssets.ReloadAllAssets();
+
+        // item 1 should have been updated from file
+        const auto* pAsset = gameAssets.FindAchievement({ 1U });
+        Assert::IsNotNull(pAsset);
+        Ensures(pAsset != nullptr);
+        Assert::AreEqual(std::string("0xH1234=0"), pAsset->GetTrigger());
+        Assert::AreEqual(AssetCategory::Core, pAsset->GetCategory());
+        Assert::AreEqual(AssetChanges::Unpublished, pAsset->GetChanges());
+
+        // memory regions should have been modified
+        Assert::AreEqual({ 1U }, pMemoryRegions.CustomRegions().size());
+    }
+
     TEST_METHOD(TestSaveLocalLeaderboard)
     {
         GameAssetsHarness gameAssets;