From 9448345de30760021b5f71411a5f8022819e86ec Mon Sep 17 00:00:00 2001 From: Hong Liang Date: Fri, 26 Sep 2014 11:29:48 +0800 Subject: [PATCH] bugfix for UI animation playing crash if GUI JSON file is loaded again. --- cocos/editor-support/cocostudio/CCActionManagerEx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp index 91753ef118..9281c92e1f 100644 --- a/cocos/editor-support/cocostudio/CCActionManagerEx.cpp +++ b/cocos/editor-support/cocostudio/CCActionManagerEx.cpp @@ -73,7 +73,7 @@ void ActionManagerEx::initWithDictionary(const char* jsonName,const rapidjson::V action->initWithDictionary(actionDic,root); actionList.pushBack(action); } - _actionDic.insert(std::pair>(fileName, actionList)); + _actionDic[fileName] = actionList; } void ActionManagerEx::initWithBinary(const char* file, @@ -108,7 +108,7 @@ void ActionManagerEx::initWithDictionary(const char* jsonName,const rapidjson::V actionList.pushBack(action); } } - _actionDic.insert(std::pair>(fileName, actionList)); + _actionDic[fileName] = actionList; }