diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2021-11-05 14:00:31 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-11-05 16:17:45 +0100 |
| commit | 324e2a5c3e6355e6b38db0add100465224841364 (patch) | |
| tree | bd9da2718a63b95d58c1eb63295021f13600efb5 | |
| parent | 1289125532a029dc80e4ee3d0a49dca253f51888 (diff) | |
tdf#144994 QtInstance::CreateMenu needs SolarMutex
It can be called from extensions (as is the case e.g.
for LanguageTool, s. tdf#144994 comment 19; assertion
is hit after clicking around in the menu a bit) and
'RunInMainThread' requires that the SolarMutex
is held.
Change-Id: I282ef6a21e60b636abb27aeba332ae3a634ce680
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124750
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | vcl/qt5/QtInstance.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx index 06840ad7281f..29a7d0e4ddf7 100644 --- a/vcl/qt5/QtInstance.cxx +++ b/vcl/qt5/QtInstance.cxx @@ -358,6 +358,7 @@ QtInstance::CreateVirtualDevice(SalGraphics& rGraphics, tools::Long& nDX, tools: std::unique_ptr<SalMenu> QtInstance::CreateMenu(bool bMenuBar, Menu* pVCLMenu) { + SolarMutexGuard aGuard; std::unique_ptr<SalMenu> pRet; RunInMainThread([&pRet, bMenuBar, pVCLMenu]() { QtMenu* pSalMenu = new QtMenu(bMenuBar); |