diff options
| author | Dan Gudmundsson <[email protected]> | 2010-08-19 10:39:21 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-08-19 10:39:21 +0200 |
| commit | 2ed3221969fa12b238f493a0cda95d7b0e443b92 (patch) | |
| tree | e701c6e9c4574b3764578564b711ad765356a306 /lib | |
| parent | 9bd5eae8bfae5d12a59d02d01af9288337de5f6b (diff) | |
| parent | a5b51d298e2f6f410eb6ae7f819749209cf4a794 (diff) | |
| download | otp-2ed3221969fa12b238f493a0cda95d7b0e443b92.tar.gz otp-2ed3221969fa12b238f493a0cda95d7b0e443b92.tar.bz2 otp-2ed3221969fa12b238f493a0cda95d7b0e443b92.zip | |
Merge branch 'dgud/wx/callback-crash/OTP-8766' into dev
* dgud/wx/callback-crash/OTP-8766:
Callback crash reported by Sergei Golovan.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp index 528a08e654..6d2926ce4e 100644 --- a/lib/wx/c_src/wxe_impl.cpp +++ b/lib/wx/c_src/wxe_impl.cpp @@ -411,7 +411,7 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process) if(event->caller == process || // Callbacks from CB process only event->op == WXE_CB_START || // Recursive event callback allow // Allow connect_cb during CB i.e. msg from wxe_server. - event->caller == memenv->owner) + (memenv && event->caller == memenv->owner)) { switch(event->op) { case WXE_BATCH_END: @@ -669,7 +669,7 @@ void WxeApp::clearPtr(void * ptr) { send_msg("debug", &msg); } - if(refd->pid != -1) { + if(((int) refd->pid) != -1) { // Send terminate pid to owner wxeReturn rt = wxeReturn(WXE_DRV_PORT,refd->memenv->owner, false); rt.addAtom("_wxe_destroy_"); |