mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 08:09:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Fix_openCS_EditRecord' into 'master'

Browse source 
Fixes issue with topic info edition.

Closes #7136

See merge request OpenMW/openmw!2594
This commit is contained in:
psi29a 2023-01-08 16:41:54 +00:00
commit 6c77498e80
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/opencs/model/world/collection.hpp
View file

@ -490,13 +490,7 @@ namespace CSMWorld
int Collection<ESXRecordT, IdAccessorT>::searchId(const ESM::RefId& id) const
{
std::map<std::string, int>::const_iterator iter
= mIndex.find(Misc::StringUtils::lowerCase(id.getRefIdString()));
if (iter == mIndex.end())
return -1;
return iter->second;
return searchId(id.getRefIdString());
}
template <typename ESXRecordT, typename IdAccessorT>

2
apps/opencs/model/world/data.cpp
View file

@ -1242,10 +1242,10 @@ bool CSMWorld::Data::continueLoading(CSMDoc::Messages& messages)
case ESM::REC_DIAL:
{
ESM::Dialogue record;
const std::string& recordIdString = record.mId.getRefIdString();
bool isDeleted = false;
record.load(*mReader, isDeleted);
const std::string& recordIdString = record.mId.getRefIdString();
if (isDeleted)
{