diff options
| author | Dan Gudmundsson <[email protected]> | 2014-01-27 14:23:15 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-01-27 14:23:15 +0100 |
| commit | 75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d (patch) | |
| tree | cedea2151cdc673bddfe541cf4956c5fd6b431ab /lib/wx/c_src/wxe_driver.c | |
| parent | c922ea6f82bb3d95d05d1f212b91e13f97e972b8 (diff) | |
| parent | fd055cf43486358a413a1fa22f30f0aa711d25e1 (diff) | |
| download | otp-75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d.tar.gz otp-75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d.tar.bz2 otp-75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d.zip | |
Merge branch 'dgud/wx/refactor-and-bugfixes/OTP-11586'
* dgud/wx/refactor-and-bugfixes/OTP-11586:
wx: Delay all deletes if recursed in event loop
wx: wx could hang if wxe_server died (or had died) when inside a callback
wx: Delay memory cleanup until safe
wx: Refactor C++ code
wx: Add init_dialog event
Update icons
wx: Update icons to plain old white ones
Diffstat (limited to 'lib/wx/c_src/wxe_driver.c')
| -rw-r--r-- | lib/wx/c_src/wxe_driver.c | 4 |
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); */ |