diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-03 17:17:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-17 07:16:26 +0000 |
| commit | ea2c3f47682b79319d5ccaade4226f45aeec7369 (patch) | |
| tree | 496d4be4969692816820ad2655a993171a8dda10 /vcl | |
| parent | 9536bef4baeb476a54ce7cd382ded1f594efa69f (diff) | |
tdf#99383 vcl: don't dispatch events from SolarMutexReleaser
Having SolarMutexReleaser effectively do Reschedule() on WNT and not on
other platforms doesn't seem such a good idea. Let's try to restrict it
so that it still calls ImplSalYieldMutexAcquireWithWait() but no longer
dispatches messages, timers and idles.
(regression from 482c52e91fe41a52e68827e9bf64a9736427d517)
Change-Id: I52a2c88e9c2473e35909bf270b9e3ae7acbe0d17
(cherry picked from commit ea3ce0b3073c72f474365e438ddabd19de915b76)
Reviewed-on: https://gerrit.libreoffice.org/24623
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 7 | ||||
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index a18b91eef04d..a5a01a16242f 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -515,8 +515,11 @@ inline bool ImplYield(bool i_bWait, bool i_bAllEvents, sal_uLong const nReleased DBG_TESTSOLARMUTEX(); // must be locked on return from Yield - // Process all Tasks - Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT); + if (nReleased == 0) // tdf#99383 don't run stuff from ReAcquireSolarMutex + { + // Process all Tasks + Scheduler::ProcessTaskScheduling(eResult == SalYieldResult::EVENT); + } // flush lazy deleted objects if( pSVData->maAppData.mnDispatchLevel == 0 ) diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 5cf6c3dd58ba..40e44d2faf39 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -696,7 +696,10 @@ SalYieldResult WinSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents, } else { - eDidWork = ImplSalYield( bWait, bHandleAllCurrentEvents ); + if (nReleased == 0) // tdf#99383 ReAcquireSolarMutex shouldn't Yield + { + eDidWork = ImplSalYield( bWait, bHandleAllCurrentEvents ); + } n = nCount; while ( n ) |