desktop/source/app/app.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 15a040d925bc9640e34ab728d683b22c47d3514f
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Oct 16 12:07:57 2020 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue Oct 20 19:20:39 2020 +0200
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.lu...@collabora.com>
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
