summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-25 10:02:25 +0100
committerJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-25 10:05:53 +0100
commite7b3f27362948a16b95a33220f0d826dce1b5ea5 (patch)
tree763b38d3b009d87d94c5d546071bfeaa41426e9a
parentbreakpad: fix build against CentOS6 baseline (diff)
downloadcore-private/jmux/win-test-nohang.tar.gz
core-private/jmux/win-test-nohang.zip
WIN disable AttachThreadInput hack private/jmux/win-test-nohang
just a test patch to fix eventual hangs. Change-Id: I8de0a17aaaa44c24b1ee728b2ef6ec3aea951c54
-rw-r--r--vcl/win/window/salframe.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 8b0a64232927..298bb8e53a49 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -1930,12 +1930,16 @@ static void ImplSalToTop( HWND hWnd, SalFrameToTop nFlags )
// This magic code is necessary to connect the input focus of the
// current window thread and the thread which owns the window that
// should be the new foreground window.
+#if 0
HWND hCurrWnd = GetForegroundWindow();
DWORD myThreadID = GetCurrentThreadId();
DWORD currThreadID = GetWindowThreadProcessId(hCurrWnd,nullptr);
AttachThreadInput(myThreadID, currThreadID,TRUE);
SetForegroundWindow_Impl(hWnd);
AttachThreadInput(myThreadID,currThreadID,FALSE);
+#else
+ SetForegroundWindow_Impl(hWnd);
+#endif
}
if ( nFlags & SalFrameToTop::RestoreWhenMin )