Fix undo duplicate model crashes

UnrealKaraulov · Dec 2, 2023 · f312402 · f312402
1 parent 750b254
commit f312402
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/editor/Command.cpp b/src/editor/Command.cpp
@@ -307,12 +307,15 @@ void DuplicateBspModelCommand::undo()
 	Bsp* map = getBsp();
 	BspRenderer* renderer = getBspRenderer();
 
-	Entity* ent = map->ents[entIdx];
 
 	g_app->deselectObject();
 
 	map->replace_lumps(oldLumps);
 
+	map->update_ent_lump();
+
+
+	Entity* ent = map->ents[entIdx];
 	ent->setOrAddKeyvalue("model", "*" + std::to_string(oldModelIdx));
 
 

diff --git a/src/util/lang.cpp b/src/util/lang.cpp
@@ -20,7 +20,7 @@ std::string get_localized_string(int id)
 
 	if (itr == lang_db.end())
 	{
-		std::string value = ft->GetSection(g_settings.language)->GetValue(fmt::format("LANG_{:04}", id), fmt::format("LANG_{:04}", id)).AsString();
+		std::string value = ft->GetSection(g_settings.language)->GetValue(fmt::format("LANG_{:04}", id), fmt::format("NO LANG_{:04}", id)).AsString();
 		replaceAll(value, "\\n", "\n");
 		lang_db[id] = value;
 		return value;