Kaydet (Commit) 3e5371ab authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Tor Lillqvist

Avoid deadlock in a convoluted situation with an IME and a URP client

Change-Id: I0338d1c68fe6be8793777a3a238c750560bcf7fe
üst d5cdc756
......@@ -2304,8 +2304,12 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
{
// Must be called in the main thread!
SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
SalData* pSalData = GetSalData();
if ( pSalData->mnAppThreadId != GetCurrentThreadId() )
ImplSalFrameEndExtTextInput( mhWnd, nFlags);
else
SendMessageW( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
}
static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment