mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 18:45:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2072 from elsid/navmesh_tiles_cache_item_fix

Browse source 
Navmesh tiles cache item fix (bug #4751)
This commit is contained in:
Bret Curtis 2018-12-11 09:53:52 +01:00 committed by GitHub
commit 401ccedb36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/detournavigator/navmeshtilescache.hpp
View file

@ -56,12 +56,12 @@ namespace DetourNavigator
Value(Value&& other) Value(Value&& other)
: mOwner(other.mOwner), mIterator(other.mIterator) : mOwner(other.mOwner), mIterator(other.mIterator)
{ {
other.mIterator = ItemIterator(); other.mOwner = nullptr;
} }
~Value() ~Value()
{ {
if (mIterator != ItemIterator()) if (mOwner)
mOwner->releaseItem(mIterator); mOwner->releaseItem(mIterator);
} }
@ -69,16 +69,13 @@ namespace DetourNavigator
Value& operator =(Value&& other) Value& operator =(Value&& other)
{ {
if (mIterator == other.mIterator) if (mOwner)
return *this;
if (mIterator != ItemIterator())
mOwner->releaseItem(mIterator); mOwner->releaseItem(mIterator);
mOwner = other.mOwner; mOwner = other.mOwner;
mIterator = other.mIterator; mIterator = other.mIterator;
other.mIterator = ItemIterator(); other.mOwner = nullptr;
return *this; return *this;
} }
@ -90,7 +87,7 @@ namespace DetourNavigator
operator bool() const operator bool() const
{ {
return mIterator != ItemIterator(); return mOwner;
} }
private: private: