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_gl.cpp | |
| 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_gl.cpp')
| -rw-r--r-- | lib/wx/c_src/wxe_gl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp index 5126804b9f..7f2e767a6b 100644 --- a/lib/wx/c_src/wxe_gl.cpp +++ b/lib/wx/c_src/wxe_gl.cpp @@ -138,9 +138,9 @@ void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins){ wxGLCanvas * current = glc[caller]; if(current) { if(current != glc[gl_active]) { - gl_active = caller; current->SetCurrent(); } + gl_active = caller; } else { ErlDrvTermData rt[] = // Error msg {ERL_DRV_ATOM, driver_mk_atom((char *) "_egl_error_"), |