mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Don't call Store::setUp() unnecessarily

Browse Source 
Fixes a threading issue with ESM::Land store caused by calling setUp() while it's being used.
This commit is contained in:
scrawl 2018-02-13 00:38:55 +00:00
parent 5bb7d76913
commit a708ac488e
No known key found for this signature in database
GPG Key ID: 2E6CC3676024C402
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwworld/store.cpp
View File

@ -607,6 +607,11 @@ namespace MWWorld
}
return ptr;
}
void Store<ESM::Cell>::clearDynamic()
{
setUp();
}
void Store<ESM::Cell>::setUp()
{
typedef DynamicExt::iterator ExtIterator;

1
apps/openmw/mwworld/store.hpp
View File

@ -293,6 +293,7 @@ namespace MWWorld
const ESM::Cell *find(const std::string &id) const;
const ESM::Cell *find(int x, int y) const;
virtual void clearDynamic();
void setUp();
RecordId load(ESM::ESMReader &esm);

1
apps/openmw/mwworld/worldimp.cpp
View File

@ -295,7 +295,6 @@ namespace MWWorld
mWorldScene->clear();
mStore.clearDynamic();
mStore.setUp();
if (mPlayer)
{