diff options
| author | Dan Gudmundsson <[email protected]> | 2011-12-07 09:26:22 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-12-07 09:26:22 +0100 |
| commit | 71249e713aaf0f6aea513fd2347b0c5f303d1e6e (patch) | |
| tree | c4d4205e8666375c54dc3aeea8d3a1bf53da57bb /lib/wx/src/gen/wxEvtHandler.erl | |
| parent | 6b31de5969abeb37f7d8d43815a236abadb42508 (diff) | |
| parent | 8b6f6db0f5faddc970a7867aecdb03f3cde5fa78 (diff) | |
| download | otp-71249e713aaf0f6aea513fd2347b0c5f303d1e6e.tar.gz otp-71249e713aaf0f6aea513fd2347b0c5f303d1e6e.tar.bz2 otp-71249e713aaf0f6aea513fd2347b0c5f303d1e6e.zip | |
Merge branch 'dgud/wx/deadlock-syncevent/OTP-9725'
* dgud/wx/deadlock-syncevent/OTP-9725:
[wx] Avoid deadlock in handle_sync_event
Diffstat (limited to 'lib/wx/src/gen/wxEvtHandler.erl')
| -rw-r--r-- | lib/wx/src/gen/wxEvtHandler.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/src/gen/wxEvtHandler.erl b/lib/wx/src/gen/wxEvtHandler.erl index f155351b66..820c2b7a58 100644 --- a/lib/wx/src/gen/wxEvtHandler.erl +++ b/lib/wx/src/gen/wxEvtHandler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. 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 @@ -95,7 +95,7 @@ parse_opts([{callback,Fun}|R], Opts) when is_function(Fun) -> %% Check Fun Arity? parse_opts(R, Opts#evh{cb=Fun}); parse_opts([callback|R], Opts) -> - parse_opts(R, Opts#evh{cb=1}); + parse_opts(R, Opts#evh{cb=self()}); parse_opts([{userData, UserData}|R],Opts) -> parse_opts(R, Opts#evh{userdata=UserData}); parse_opts([{skip, Skip}|R],Opts) when is_boolean(Skip) -> |