diff options
| author | Dan Gudmundsson <[email protected]> | 2015-05-05 09:31:18 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-05-05 09:31:18 +0200 |
| commit | 676500a8042165ae3391275fb638471a5a05b25f (patch) | |
| tree | f38c152677c66e13c4bf79df0dd46e5140812441 /lib/wx/c_src/gen | |
| parent | 727338fe38bb9aae0ea4d9069d8a1d6e1694a2dd (diff) | |
| parent | 60229a03667a9bac8917a78c922bec4885d2d53f (diff) | |
| download | otp-676500a8042165ae3391275fb638471a5a05b25f.tar.gz otp-676500a8042165ae3391275fb638471a5a05b25f.tar.bz2 otp-676500a8042165ae3391275fb638471a5a05b25f.zip | |
Merge branch 'dgud/wx/optimize-queues'
* dgud/wx/optimize-queues:
wx: Fix delete object
wx: Optimize command queues
wx: Optimize OpenGL invocations
Diffstat (limited to 'lib/wx/c_src/gen')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_funcs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index 91ce5d810c..3b11c0642e 100644 --- a/lib/wx/c_src/gen/wxe_funcs.cpp +++ b/lib/wx/c_src/gen/wxe_funcs.cpp @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2014. All Rights Reserved. + * Copyright Ericsson AB 2008-2015. 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 @@ -51,8 +51,8 @@ void WxeApp::wxe_dispatch(wxeCommand& Ecmd) if(recurse_level > 1 && refd->type != 4) { delayed_delete->Append(Ecmd.Save()); } else { - ((WxeApp *) wxTheApp)->clearPtr(This); - delete_object(This, refd); } + delete_object(This, refd); + ((WxeApp *) wxTheApp)->clearPtr(This);} } } break; case WXE_REGISTER_OBJECT: { registerPid(bp, Ecmd.caller, memenv); |