summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-10-20 15:18:30 +0100
committerAron Budea <aron.budea@collabora.com>2017-11-02 23:03:45 +0100
commitdc34b649e821cfe55386a054420c4e65ac4b3683 (patch)
tree52fb979da6eb4abd1e8ab7cdae42d47e7bc52702
parenta674d73119d4caa5f08a1a2798e2417dee859ed1 (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/43636 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a9534d12f861238dd59010baa1ff0d798b5dd6f7) Reviewed-on: https://gerrit.libreoffice.org/44066 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.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 67ac2c6c3ed2..cc1da7357757 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -905,6 +905,7 @@ void BubbleWindow::RecalcTextRects()
static uno::Reference<uno::XInterface> SAL_CALL
createInstance(const uno::Reference<uno::XComponentContext>& xContext)
{
+ SolarMutexGuard aGuard;
return *new UpdateCheckUI(xContext);
}