diff options
| author | Dan Gudmundsson <[email protected]> | 2016-04-22 09:14:44 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-04-22 09:14:44 +0200 |
| commit | e0a67398ad3d034e1afe59585a5f82af6981c1eb (patch) | |
| tree | d30cbe869fd90d312857f44cafd39301c79e867f /lib/wx/c_src/wxe_helpers.cpp | |
| parent | 9bff4dbbaf44ff563b3d67c65061f5f0a7d7f944 (diff) | |
| parent | eeb1a534c7be3648d74f490a3daaccb6bbe8545a (diff) | |
| download | otp-e0a67398ad3d034e1afe59585a5f82af6981c1eb.tar.gz otp-e0a67398ad3d034e1afe59585a5f82af6981c1eb.tar.bz2 otp-e0a67398ad3d034e1afe59585a5f82af6981c1eb.zip | |
Merge branch 'dgud/wx/show_modal_callback_hangs/OTP-13491'
* dgud/wx/show_modal_callback_hangs/OTP-13491:
wx test: Setup timetraps
wx: Fix callback problems
Diffstat (limited to 'lib/wx/c_src/wxe_helpers.cpp')
| -rw-r--r-- | lib/wx/c_src/wxe_helpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/wx/c_src/wxe_helpers.cpp b/lib/wx/c_src/wxe_helpers.cpp index 76958a346f..4798e605e8 100644 --- a/lib/wx/c_src/wxe_helpers.cpp +++ b/lib/wx/c_src/wxe_helpers.cpp @@ -47,8 +47,8 @@ void wxeCommand::Delete() if(len > 64) driver_free(buffer); buffer = NULL; - op = -1; } + op = -1; } /* **************************************************************************** @@ -226,7 +226,7 @@ unsigned int wxeFifo::Cleanup(unsigned int def) // Realloced we need to start from the beginning return 0; } else { - return def; + return def < cb_start? def : cb_start; } } |