diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-19 09:46:54 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-19 12:03:16 +0200 |
| commit | 90e645d4340b110f03dff78dbe35593946948cba (patch) | |
| tree | a42d0d32621d8e45179063849d48f2c3eb5a560b /vcl | |
| parent | 6ea4e63248e2400abd71684cf11af2714cb9890a (diff) | |
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/+/115786
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index dc3fa90f7dec..3d213d62a194 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -7961,7 +7961,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); |