diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp index 7fc0b97911..a699b6785e 100644 --- a/apps/opencs/model/world/universalid.cpp +++ b/apps/opencs/model/world/universalid.cpp @@ -276,8 +276,8 @@ CSMWorld::UniversalId::UniversalId(Type type, const std::string& id) } CSMWorld::UniversalId::UniversalId(Type type, const ESM::RefId& id) + : UniversalId(type, id.getRefIdString()) { - UniversalId(type, id.getRefIdString()); } CSMWorld::UniversalId::UniversalId(Type type, int index) diff --git a/apps/opencs_tests/model/world/testuniversalid.cpp b/apps/opencs_tests/model/world/testuniversalid.cpp index a891f7528b..93ddd6ce8f 100644 --- a/apps/opencs_tests/model/world/testuniversalid.cpp +++ b/apps/opencs_tests/model/world/testuniversalid.cpp @@ -150,6 +150,10 @@ namespace CSMWorld Params{ UniversalId("Instance: f"), UniversalId::Type_Reference, UniversalId::Class_SubRecord, UniversalId::ArgumentType_Id, "Instance", "Instance: f", ":./instance.png" }, + + Params{ UniversalId(UniversalId::Type_Reference, ESM::RefId::stringRefId("g")), UniversalId::Type_Reference, + UniversalId::Class_SubRecord, UniversalId::ArgumentType_Id, "Instance", "Instance: g", + ":./instance.png" }, }; INSTANTIATE_TEST_SUITE_P(ValidParams, CSMWorldUniversalIdValidPerTypeTest, ValuesIn(validParams));