diff options
| author | Dan Gudmundsson <[email protected]> | 2014-01-21 15:57:57 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-01-21 15:57:57 +0100 |
| commit | 31172443bfc849b879385d7ee0d2ea8019c32307 (patch) | |
| tree | a66e29fe08d3bccc85a9b1a4cefdbb0f2edfceed /lib/wx/c_src/wxe_impl.cpp | |
| parent | 744984833cc1a51f51781e3417db7f152eeab4ae (diff) | |
| parent | 51e369a1b90490e69a358d8c8f0bb9bfbf9f511c (diff) | |
| download | otp-31172443bfc849b879385d7ee0d2ea8019c32307.tar.gz otp-31172443bfc849b879385d7ee0d2ea8019c32307.tar.bz2 otp-31172443bfc849b879385d7ee0d2ea8019c32307.zip | |
Merge branch 'dgud/wx/more-fixes/OTP-11444' into maint
* dgud/wx/more-fixes/OTP-11444:
wx: Fix hanging wx calls
Update wx build instsructions for Darwin
wx: Remove compiler option -fomit-frame-pointer on Darwin
wx: Fix crash when garbage collect event handlers (debugger caused seg fault)
wx: Fix LDFLAGS for Mac
Diffstat (limited to 'lib/wx/c_src/wxe_impl.cpp')
| -rw-r--r-- | lib/wx/c_src/wxe_impl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp index 4968075659..cc9bcc9957 100644 --- a/lib/wx/c_src/wxe_impl.cpp +++ b/lib/wx/c_src/wxe_impl.cpp @@ -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,9 +195,8 @@ void meta_command(int what, wxe_data *sd) { wxeCommand *Cmd = new wxeCommand(WXE_DEBUG_PING, NULL, 0, sd); wxe_batch->Append(Cmd); erl_drv_cond_signal(wxe_batch_locker_c); - } else { - wxWakeUpIdle(); } + wxWakeUpIdle(); erl_drv_mutex_unlock(wxe_batch_locker_m); } else { if(sd) { |