diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-29 19:41:40 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-10-02 08:07:20 +0200 |
| commit | f5415276307603df6de364091435e81883ea10fb (patch) | |
| tree | 2673cedff9ae93d1eb0e5cd6c772e40946b13bef | |
| parent | 3d81ec3365cb327c73696892c8edd6eea9d52220 (diff) | |
tdf#44497 run LicenseDialog with SolarMutex locked
Before commit 3840aede596e6fc24f7ed7df9100fb028134aac6 releasing
an unlocked SolarMutex was simply ignored, but now it aborts.
So run the LicenseDialog GUI code holding the SolarMutex, as
required.
Change-Id: Id9f5f6146cdfe2b21b68a2cdffc9dd4a527b551c
Reviewed-on: https://gerrit.libreoffice.org/42951
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 05f4dade58a0..62f875e00d44 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -392,6 +392,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= licExc) { + SolarMutexGuard guard; uno::Reference< ui::dialogs::XExecutableDialog > xDialog( deployment::ui::LicenseDialog::create( m_xContext, VCLUnoHelper::GetInterface( m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr ), |