krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests 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; return ptr;
} }
void Store<ESM::Cell>::clearDynamic()
{
setUp();
}
void Store<ESM::Cell>::setUp() void Store<ESM::Cell>::setUp()
{ {
typedef DynamicExt::iterator ExtIterator; 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(const std::string &id) const;
const ESM::Cell *find(int x, int y) const; const ESM::Cell *find(int x, int y) const;
virtual void clearDynamic();
void setUp(); void setUp();
RecordId load(ESM::ESMReader &esm); RecordId load(ESM::ESMReader &esm);

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

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