ObjectListModel: Fix assert in objectRemovedMainThread #73
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's not safe to assume that m_invalidatedObjects does not contain obj in case objectRemovedMainThread is called from the main thread. We can end up in this order of calls: - objectRemoved from a thread other than the main thread - inserts obj into m_invalidatedObjects - queues a call to objectRemovedMainThread - objectAdded with the same obj-pointer - objectRemoved from the main thread - calls objectRemovedMainThread directly - m_invalidatedObjects still contains obj. => Assertion triggered We fix this by always trying to remove obj from m_invalidatedObjects in objectRemovedMainThread.
|
Looks good to me, thanks! |
krf
added a commit
that referenced
this pull request
Mar 18, 2014
ObjectListModel: Fix assert in objectRemovedMainThread
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's not safe to assume that m_invalidatedObjects does not contain obj in
case objectRemovedMainThread is called from the main thread.
We can end up in this order of calls:
=> Assertion triggered
We fix this by always trying to remove obj from m_invalidatedObjects in
objectRemovedMainThread.