aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/c_src/wxe_driver.c
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-01-17 17:07:14 +0100
committerDan Gudmundsson <[email protected]>2014-01-22 16:33:01 +0100
commit84a83493c2bd9b01b3d90a2ebef49b0c698c0797 (patch)
tree2daf05624743c32f5b79eb6ab1f2a73adccd8158 /lib/wx/c_src/wxe_driver.c
parentfb767602c08159daa2190129622ebf185606fd35 (diff)
downloadotp-84a83493c2bd9b01b3d90a2ebef49b0c698c0797.tar.gz
otp-84a83493c2bd9b01b3d90a2ebef49b0c698c0797.tar.bz2
otp-84a83493c2bd9b01b3d90a2ebef49b0c698c0797.zip
wx: wx could hang if wxe_server died (or had died) when inside a callback
The pid is not available via driver_caller(..) (see wxeCommand constr) inside driver_monitor callback.
Diffstat (limited to 'lib/wx/c_src/wxe_driver.c')
-rw-r--r--lib/wx/c_src/wxe_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index 4d3aa577bf..ea52737fa2 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -195,7 +195,7 @@ void wxe_process_died(ErlDrvData handle, ErlDrvMonitor *monitor)
{
/* Callback is active for the dead process */
wxe_data *sd = ((wxe_data *)handle);
- push_command(WXE_CB_RETURN,NULL,0,sd);
+ push_command(WXE_CB_DIED,NULL,0,sd);
/* ErlDrvTermData pid; */
/* pid = driver_get_monitored_process(sd->port_handle, monitor); */