summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-10-16 12:07:57 +0200
committerLuboš Luňák <l.lunak@collabora.com>2020-10-20 19:20:39 +0200
commit15a040d925bc9640e34ab728d683b22c47d3514f (patch)
tree01b7b07cc5fbbe65304c00367452e63df21700d4 /desktop
parent7d2bab41350d7006366b7c450879fe99209713ea (diff)
ensure solarmutex is locked when closing splashscreen (tdf#137177)
AFAICT all drawing is done with solarmutex held, at least Skia asserts that and this case is the only problem I've found. Here the solarmutex is not held because of c5cf78e1529970c04e1999e1 that unlocks it for DeInit(), but that call leads to closing the splashscreen. Change-Id: I453f71cc53fe229e539a862927a58fd4161c40d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104423 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 04f64621c059..19883d351691 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2435,6 +2435,7 @@ void Desktop::CloseSplashScreen()
{
if(m_rSplashScreen.is())
{
+ SolarMutexGuard ensureSolarMutex;
m_rSplashScreen->end();
m_rSplashScreen = nullptr;
}