diff options
| author | Dan Gudmundsson <[email protected]> | 2016-05-17 14:43:26 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-05-17 14:43:26 +0200 |
| commit | 8f213ab9fc5e87f4d54c134bd3d7017ab772b452 (patch) | |
| tree | 1d8af9c7b5588dce559765f977496d13f671e170 /lib/wx/test/wx_class_SUITE.erl | |
| parent | 0545c22c9c07c55569e067c57ec184f018a54947 (diff) | |
| parent | 415a912b969c24a60c47ff7e74e560047b2d747f (diff) | |
| download | otp-8f213ab9fc5e87f4d54c134bd3d7017ab772b452.tar.gz otp-8f213ab9fc5e87f4d54c134bd3d7017ab772b452.tar.bz2 otp-8f213ab9fc5e87f4d54c134bd3d7017ab772b452.zip | |
Merge branch 'dgud/wx/cmd-queue-bug'
* dgud/wx/cmd-queue-bug:
Fix compilation warning
wx: Fix generated defines in gl.hrl
wx: Fix driver command queue
Diffstat (limited to 'lib/wx/test/wx_class_SUITE.erl')
| -rw-r--r-- | lib/wx/test/wx_class_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl index 6944a78360..0a3c4659bf 100644 --- a/lib/wx/test/wx_class_SUITE.erl +++ b/lib/wx/test/wx_class_SUITE.erl @@ -646,8 +646,8 @@ modal(Config) -> %% need to sleep so we know that the window is stuck in %% the ShowModal event loop and not in an earlier event loop %% wx2.8 invokes the event loop from more calls than wx-3 - receive {dialog, M1, 1} -> timer:sleep(1200), ets:insert(test_state, {M1, ready}) end, - receive {dialog, M2, 2} -> timer:sleep(1200), ets:insert(test_state, {M2, ready}) end, + M1 = receive {dialog, W1, 1} -> timer:sleep(1200), ets:insert(test_state, {W1, ready}), W1 end, + M2 = receive {dialog, W2, 2} -> timer:sleep(1200), ets:insert(test_state, {W2, ready}), W2 end, receive done -> ok end, receive {dialog_done, M2, 2} -> M2 end, |