summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-10-20 15:18:30 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-10-24 12:00:30 +0200
commitfdd5e6693ee82d1499d542f8c97f28bd304fc164 (patch)
treea239ec320f06f28ff5992b0536f23c691783709e
parenta3cd1ba97066f73531217778691210ad973a6f52 (diff)
tdf#113225 - hold the solar mutex when entering from UNO.
http://crashreport.libreoffice.org/stats/crash_details/dff57662-1693-47f6-8b09-88f180d2e706 Change-Id: I4322c2113c300af97fb5854aac4a741b7027e6b1 Reviewed-on: https://gerrit.libreoffice.org/43623 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 254c49dcceaa8b181b2cb3338e34e5637be277b9) Reviewed-on: https://gerrit.libreoffice.org/43637 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b2bb871b9b91d1a22f4db2edd5cb93a2011318ec) Reviewed-on: https://gerrit.libreoffice.org/43673 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 6973b657781f..631379aa162e 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -945,6 +945,7 @@ void BubbleWindow::RecalcTextRects()
static uno::Reference<uno::XInterface> SAL_CALL
createInstance(const uno::Reference<uno::XComponentContext>& xContext)
{
+ SolarMutexGuard aGuard;
return *new UpdateCheckUI(xContext);
}