aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/c_src/wxe_impl.h
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-04-07 08:05:39 +0200
committerDan Gudmundsson <[email protected]>2017-04-07 08:05:39 +0200
commit97d1f21f53fabd27e31fe9aa46ffd9f0c00bcbec (patch)
treeb885aaced823796d24525a5eb13e7c98ddd89067 /lib/wx/c_src/wxe_impl.h
parent356d27670bba7e243ca214839b0787b351593ac6 (diff)
parentb901918e7616dd346bfeb3e3c22be608a27f8da4 (diff)
downloadotp-97d1f21f53fabd27e31fe9aa46ffd9f0c00bcbec.tar.gz
otp-97d1f21f53fabd27e31fe9aa46ffd9f0c00bcbec.tar.bz2
otp-97d1f21f53fabd27e31fe9aa46ffd9f0c00bcbec.zip
Merge branch 'dgud/wx/fix-livelock/OTP-14289'
* dgud/wx/fix-livelock/OTP-14289: Avoid livelock in driver when batching commands
Diffstat (limited to 'lib/wx/c_src/wxe_impl.h')
-rw-r--r--lib/wx/c_src/wxe_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h
index 57dac997ab..68f5deb336 100644
--- a/lib/wx/c_src/wxe_impl.h
+++ b/lib/wx/c_src/wxe_impl.h
@@ -73,7 +73,7 @@ public:
void wxe_dispatch(wxeCommand& event);
void idle(wxIdleEvent& event);
- void dispatch_cmds();
+ int dispatch_cmds();
void dummy_close(wxEvent& Ev);
bool sendevent(wxEvent *event);