Merge pull request #3064 from minggo/iss2361-set-bugfix

fix a crash caused by Set::removeAllObjects()
2013-07-03 00:29:29 -07:00 · 2013-07-03 00:29:29 -07:00 · 735ebf0e7f
parent 34d4594df3 f089e62e8f
commit 735ebf0e7f
1 changed files with 8 additions and 3 deletions
--- a/cocos2dx/cocoa/CCSet.cpp
+++ b/cocos2dx/cocoa/CCSet.cpp
@ -109,15 +109,20 @@ void Set::removeObject(Object *pObject)

 void Set::removeAllObjects()
 {
-    for (SetIterator it = _set->begin(); it != _set->end(); )
+    SetIterator it = _set->begin();
+    SetIterator tmp;
+
+    while (it != _set->end())
    {
        if (!(*it))
        {
            break;
        }
        
-        (*it)->release();
-        _set->erase(it++);
+        tmp = it;
+        ++tmp;
+        _set->erase(it);
+        it = tmp;
    }
 }