[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/headless

[Libreoffice Gerrit user]

 vcl/headless/svpinst.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3fb90f6eab998d0fda07bd3f4a2ebf650e6b6a61
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Nov 5 16:59:20 2018 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Nov 6 15:55:42 2018 +0100

    update main thread "properly" in headless case
    
    Change-Id: Ie76555a007db13e89f06c85d02beebf84eadea0b
    Reviewed-on: https://gerrit.libreoffice.org/62912
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index a175075df2d7..49f4aa213b3a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -390,7 +390,10 @@ bool SvpSalInstance::IsMainThread() const
 void SvpSalInstance::updateMainThread()
 {
     if (!IsMainThread())
+    {
         m_MainThread = osl::Thread::getCurrentIdentifier();
+        ImplGetSVData()->mnMainThreadId = osl::Thread::getCurrentIdentifier();
+    }
 }
 
 bool SvpSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents)