diff options
| author | Mark Hung <marklh9@gmail.com> | 2016-07-11 23:22:25 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2016-07-30 14:41:23 +0000 |
| commit | 462d2311384e71ab76f9d8d357d2bc1375490b13 (patch) | |
| tree | 4687bccd495bb3f21f23756d439ded1246d1c4d1 /vcl/win | |
| parent | 97353e5c43815b45a6f365ccaea474899683d38e (diff) | |
Fix SolarMutex not locked when using IME on dropdown list.
Surround ImplHandleIMEQueryCharPosition() by
ImplSalYieldMutexAcquireWithWait() and ImplSalYieldMutexRelease().
Change-Id: I3843ad351f3b92801cd1e0066a3c73f2a52c44bd
Reviewed-on: https://gerrit.libreoffice.org/27117
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/window/salframe.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 084705cd2b35..0f341f74b422 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -5857,7 +5857,13 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP } else if ( (sal_uIntPtr)( wParam ) == IMR_QUERYCHARPOSITION ) { - nRet = ImplHandleIMEQueryCharPosition( hWnd, lParam ); + if ( ImplSalYieldMutexTryToAcquire() ) + { + nRet = ImplHandleIMEQueryCharPosition( hWnd, lParam ); + ImplSalYieldMutexRelease(); + } + else + nRet = FALSE; rDef = FALSE; } break; |