aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2010-08-18 11:12:16 +0200
committerDan Gudmundsson <[email protected]>2010-08-18 11:12:16 +0200
commita5b51d298e2f6f410eb6ae7f819749209cf4a794 (patch)
tree7080e8dc061ee0019eb79e4ff0d42a3e8b1c08ce
parent4961daa3b35822ae4221209f72767aabad113368 (diff)
downloadotp-a5b51d298e2f6f410eb6ae7f819749209cf4a794.tar.gz
otp-a5b51d298e2f6f410eb6ae7f819749209cf4a794.tar.bz2
otp-a5b51d298e2f6f410eb6ae7f819749209cf4a794.zip
Callback crash reported by Sergei Golovan.
May also be the reason of the crash seen on windows by several others.
-rw-r--r--lib/wx/c_src/wxe_impl.cpp4
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_");