summaryrefslogtreecommitdiff
path: root/vcl/inc/win/salinst.h
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2018-08-24 09:14:47 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-08-25 20:34:06 +0200
commita42c65176f2791cf5e48578a8898bf03185adc89 (patch)
treef02976fe8374688bbe1882808356d9e976b1c881 /vcl/inc/win/salinst.h
parent447b5706355d6b8e257e63925bf5818e7e963aeb (diff)
tdf#118786 WIN just assert in Yield
This reminds me - again - that Jenkins doesn't run make check. It turns out InSendMessage() also returns true, if you process a nested SendMessage in the same thread. Therefore we have to remove the SalComWndProc assert and just keep the one in the Yield call. Why? Because there seem to be no way to get the information ReplyMessage has access to, so we could detect the caller / origin of the send message and implement proper nested call checks. The alternative would be to change all call sites of SendMessage to: if ( !pSalData->mpInstance->IsMainThread() ) SendMessage(...) else SalComWndProc(...) which is the same SendMessage already does. Change-Id: I991d68a64952dc5d47ba51edd8635c9e8c46614c Reviewed-on: https://gerrit.libreoffice.org/59538 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit bf0a63dc93a746a008fb1656457c77de8df693ba) Reviewed-on: https://gerrit.libreoffice.org/59565
Diffstat (limited to 'vcl/inc/win/salinst.h')
-rw-r--r--vcl/inc/win/salinst.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 43902c065324..99ca44056641 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -39,7 +39,7 @@ public:
SalYieldMutex* mpSalYieldMutex;
osl::Condition maWaitingYieldCond;
- bool mbNoYieldLock;
+ unsigned m_nNoYieldLock;
public:
WinSalInstance();