mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-16 10:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug locking mutex to access doc objects list and newId counter

Browse Source
This commit is contained in:
David Capello 2019-03-25 08:22:12 -03:00
parent 2812a95f1e
commit d18001559b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/doc/object.cpp
View File

@ -53,7 +53,7 @@ const ObjectId Object::id() const
// The first time the ID is request, we store the object in the
// "objects" hash table.
if (!m_id) {
base::scoped_unlock hold(mutex);
base::scoped_lock hold(mutex);
m_id = ++newId;
objects.insert(std::make_pair(m_id, const_cast<Object*>(this)));
}
@ -62,7 +62,7 @@ const ObjectId Object::id() const
void Object::setId(ObjectId id)
{
base::scoped_unlock hold(mutex);
base::scoped_lock hold(mutex);
if (m_id) {
auto it = objects.find(m_id);
@ -87,7 +87,7 @@ void Object::setVersion(ObjectVersion version)
Object* get_object(ObjectId id)
{
base::scoped_unlock hold(mutex);
base::scoped_lock hold(mutex);
auto it = objects.find(id);
if (it != objects.end())
return it->second;