diff options
author | Dan Gudmundsson <[email protected]> | 2015-01-13 12:54:21 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2015-01-13 12:54:21 +0100 |
commit | a12aa8db90712b4d176766249b5a45f3c9ab6f59 (patch) | |
tree | fa3bede8138bc793fcd85c467b7c07b4c421d154 /lib/wx/test | |
parent | aee18f309d41691019fc323bd41c5f78be49953b (diff) | |
parent | ddbe8a821ad57bfc2a1bcd29ed80ae8cfffe1c0e (diff) | |
download | otp-a12aa8db90712b4d176766249b5a45f3c9ab6f59.tar.gz otp-a12aa8db90712b4d176766249b5a45f3c9ab6f59.tar.bz2 otp-a12aa8db90712b4d176766249b5a45f3c9ab6f59.zip |
Merge branch 'dgud/wx/connect-when-terminating/OTP-12374' into maint
* dgud/wx/connect-when-terminating/OTP-12374:
wx: Do not crash server when going down
Diffstat (limited to 'lib/wx/test')
-rw-r--r-- | lib/wx/test/wx_event_SUITE.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl index 076f16ba16..f9f8788d8f 100644 --- a/lib/wx/test/wx_event_SUITE.erl +++ b/lib/wx/test/wx_event_SUITE.erl @@ -336,12 +336,14 @@ connect_in_callback(Config) -> end}]), wxWindow:show(F1), receive - {continue, F1} -> Tester ! {continue, F1} + {continue, F1} -> + true = wxFrame:disconnect(F1, size), + Tester ! {continue, F1} end end, - wxFrame:connect(Frame,size, + wxFrame:connect(Frame,show, [{callback, - fun(#wx{event=#wxSize{}},_SizeEv) -> + fun(#wx{event=#wxShow{}},_SizeEv) -> io:format("Frame got size~n",[]), spawn(TestWindow) end}]), |