core.git: Branch 'distro/collabora/co-24.04' - desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/lib/init.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d1ed24ba34d422128fd48184dbc3b344b5922d3a
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Oct 1 16:58:21 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Oct 2 16:19:47 2024 +0200

    Get SolarMutex before calling ImplClearAllFontData
    
    to avoid:
    
    vcl/source/app/dbggui.cxx:35: void ImplDbgTestSolarMutex(): Assertion 
`ImplGetSVData()->mpDefInst->GetYieldMutex()->IsCurrentThread() && "SolarMutex 
not owned!"' failed.
    
    Change-Id: I6d56bb05e8a89190838c5437043bc61034607d8e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174356
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 156522e2d038..41891c139031 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -5297,6 +5297,7 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, const 
char *pOption, const c
 
         OUString sMagicFileName = "file:///:FD:/" + OUString::number(fd);
 
+        SolarMutexGuard aGuard;
         OutputDevice *pDevice = Application::GetDefaultDevice();
         OutputDevice::ImplClearAllFontData(false);
         pDevice->AddTempDevFont(sMagicFileName, "");