Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed WebSocket JSB crash issue

This commit is contained in:
pandamicro 2015-12-23 23:28:14 +08:00
parent a91a669972
commit acf03c06d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
View File

@ -140,8 +140,8 @@ public:
ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(_JSDelegate.ref()), "onclose", 1, &args); ScriptingCore::getInstance()->executeFunctionWithOwner(OBJECT_TO_JSVAL(_JSDelegate.ref()), "onclose", 1, &args);
auto copy = &p->obj; auto copy = &p->obj;
jsb_remove_proxy(p);
JS::RemoveObjectRoot(cx, copy); JS::RemoveObjectRoot(cx, copy);
jsb_remove_proxy(p);
CC_SAFE_DELETE(ws); CC_SAFE_DELETE(ws);
} }

2
tests/js-tests/src/EventTest/EventTest.js
View File

@ -366,7 +366,7 @@ var MouseTest = EventTest.extend({
if( 'mouse' in cc.sys.capabilities ) { if( 'mouse' in cc.sys.capabilities ) {
cc.eventManager.addListener({ cc.eventManager.addListener({
event: cc.EventListener.MOUSE, event: cc.EventListener.MOUSE,
onMouseDown: function(event){ onMouseDown: function(event){
var pos = event.getLocation(), target = event.getCurrentTarget(); var pos = event.getLocation(), target = event.getCurrentTarget();
if(event.getButton() === cc.EventMouse.BUTTON_RIGHT) if(event.getButton() === cc.EventMouse.BUTTON_RIGHT)