[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2811b7cb66e0bcbeb9c69e1b6b51ee30642567c1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 19 09:46:54 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu May 20 11:29:58 2021 +0200

    tdf#142370 a null response callback should be acceptable
    
    commit 7f032b2f16fad56beea1df826eb59c6f85c71268
    Date:   Sat Apr 3 01:24:30 2021 -0500
    
        tdf#127533 Make Tip-of-the-Day dialog non-modal and allow multiple tips to open
    
    calls StartExecuteAsync(nullptr) so there is no callback function for
    the response which is a little unusual.
    
    The generic backend protects against a null callback hidden behind
    maEndCtx.isSet() before calling aEndCtx.maEndDialogFn() where isSet()
    checks for a null maEndDialogFn() so do the same for the gtk backend.
    
    Change-Id: Ib5346be37bfba035a00649ff7fb1d66532739721
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115788
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f067c92b4410..2d4dc36ce5fe 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7037,7 +7037,8 @@ void GtkInstanceDialog::asyncresponse(gint ret)
     m_nCancelSignalId = 0;
     m_nSignalDeleteId = 0;
 
-    aFunc(GtkToVcl(ret));
+    if (aFunc)
+        aFunc(GtkToVcl(ret));
 
     if (nResponseSignalId)
         g_signal_handler_disconnect(m_pDialog, nResponseSignalId);