diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-10-20 14:38:29 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-12-03 18:50:39 +0100 |
| commit | 4795b6114e2d0824b1383e6dd85d0b7ede898d7b (patch) | |
| tree | 54c0486ecbb2e14aa30af5ef771762efbef854d9 | |
| parent | ef9c898a327c55dad3cd9cf4b586993929ce1357 (diff) | |
Resolves: tdf#157849 gtk_spin_button_update callback can delete widget
so later GtkInstanceEditable::signal_activate is on deleted widget
Change-Id: I9bb9848b4554792db11fc7b0e2d3491a94975b3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158168
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 38e56c87723a..9a470308d6c5 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -17240,6 +17240,12 @@ IMPL_LINK_NOARG(GtkInstanceIconView, async_signal_selection_changed, void*, void namespace { +void signalDestroyFlag(GtkWidget*, gpointer destroyed) +{ + bool* pDestroyed = static_cast<bool*>(destroyed); + *pDestroyed = true; +} + class GtkInstanceSpinButton : public GtkInstanceEditable, public virtual weld::SpinButton { private: @@ -17294,7 +17300,12 @@ private: virtual void signal_activate() override { + bool bActivateDestroy(false); + gulong nDestroySignalId = g_signal_connect(m_pButton, "destroy", G_CALLBACK(signalDestroyFlag), &bActivateDestroy); gtk_spin_button_update(m_pButton); + if (bActivateDestroy) + return; + g_signal_handler_disconnect(m_pButton, nDestroySignalId); GtkInstanceEditable::signal_activate(); } |