Merge pull request #195 from Laupetin/fix/iw5-reference-asset-menu-crash

fix: crash on trying to dump referenced iw5 menu
Laupetin · May 18, 2024 · aa50f89 · aa50f89
2 parents bd98011 + a722b86
commit aa50f89
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperMenuList.cpp
@@ -81,16 +81,21 @@ void AssetDumperMenuList::DumpMenus(MenuDumper& menuDumper, const MenuList* menu
     {
         const auto* menu = menuList->menus[menuNum];
         const auto* menuAssetName = menu->window.name;
+
+        bool isReference = false;
         if (menuAssetName && menuAssetName[0] == ',')
+        {
             menuAssetName = &menuAssetName[1];
+            isReference = true;
+        }
 
         std::ostringstream ss;
         ss << parentPath << menuAssetName << ".menu";
 
         const auto menuName = ss.str();
 
         // If the menu was embedded directly as menu list write its data in the menu list file
-        if (menuName == menuList->name)
+        if (!isReference && menuName == menuList->name)
             menuDumper.WriteMenu(menu);
         else
             menuDumper.IncludeMenu(ss.str());