diff options
| author | Dan Gudmundsson <[email protected]> | 2016-03-08 08:57:40 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-03-08 08:57:40 +0100 |
| commit | 9bfbf4319a42be7572334b57c3e16864681c252c (patch) | |
| tree | 24e81d691c2fe9e8d945415867239e2accc9e421 /lib/wx/c_src/wxe_driver.c | |
| parent | 2a44ac37f487001b551c0103ed0b4c5ab4579ff1 (diff) | |
| parent | cd754f764825d71a5e5021c617a74d2dac211409 (diff) | |
| download | otp-9bfbf4319a42be7572334b57c3e16864681c252c.tar.gz otp-9bfbf4319a42be7572334b57c3e16864681c252c.tar.bz2 otp-9bfbf4319a42be7572334b57c3e16864681c252c.zip | |
Merge remote-tracking branch 'origin/dgud/wx/bugs' into maint
* origin/dgud/wx/bugs:
wx: Use wrapper classes where possible
wx: Wait before throwing away early callbacks to wx_objects
wx: Add wxWindow:SetTransparent and CanSetTransperant
wx: Add wxWindow SetDoubleBuffered and IsDoubleBuffered from wxWidgets 3.0
wx: Remove http_util usage
wx: Tiny optimization
wx: Fix a crash with sending two binaries to command queue
Diffstat (limited to 'lib/wx/c_src/wxe_driver.c')
| -rw-r--r-- | lib/wx/c_src/wxe_driver.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c index eb7d7dcaeb..6f027ea25b 100644 --- a/lib/wx/c_src/wxe_driver.c +++ b/lib/wx/c_src/wxe_driver.c @@ -241,12 +241,10 @@ standard_outputv(ErlDrvData drv_data, ErlIOVec* ev) bin = ev->binv[1]; driver_binary_inc_refc(bin); /* Otherwise it could get deallocated */ binref->bin = bin; - sd->bin = binref; } else { /* Empty binary (becomes NULL) */ binref->base = NULL; binref->size = 0; binref->from = driver_caller(sd->port_handle); binref->bin = NULL; - sd->bin = binref; } } |