vcl/win/source/window/salframe.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2225ceb12cbf4b4886d270aef232a70e7ebf7b12
Author: Jan Holesovsky <ke...@collabora.com>
Date: Mon Sep 29 12:14:24 2014 +0300
Avoid deadlock in a convoluted situation with an IME and a URP client
Change-Id: I0338d1c68fe6be8793777a3a238c750560bcf7fe
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 1138ebd..5e27d51 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2389,8 +2389,12 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd,
sal_uInt16 nFlags )
void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
{
- // Must be called in the main thread!
- ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
+
+ SalData* pSalData = GetSalData();
+ if ( pSalData->mnAppThreadId != GetCurrentThreadId() )
+ ImplSalFrameEndExtTextInput( mhWnd, nFlags);
+ else
+ ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
}
// -----------------------------------------------------------------------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
