[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - desktop/source

[Ashod Nakashian (via logerrit)]

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

New commits:
commit 3a6544f89c438fcddd72efe216fb26b827e13bd5
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sun Mar 10 12:21:33 2019 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 8 08:56:09 2021 +0200

    LOK: don't segfault when reporting error
    
    Change-Id: Ia6d614eb15b15f43ddd3e0b5742b888060dfd581
    Reviewed-on: https://gerrit.libreoffice.org/69069
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 9fa568dced78011072390320f64eae28dd06d2b9)
    Reviewed-on: https://gerrit.libreoffice.org/78443
    (cherry picked from commit fa18cdce824525ebd76b542a44741a35062741ce)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 55d5f00ae874..352dc13d5576 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3989,7 +3989,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* pThis, const char* pComma
     else
         bResult = comphelper::dispatchCommand(aCommand, comphelper::containerToSequence(aPropertyValuesVector));
 
-    if (!bResult)
+    if (!bResult && gImpl)
     {
         SetLastExceptionMsg("Failed to dispatch " + aCommand);
     }