[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 734ec70f30340a7d943dc8121b51a2a24902a5c5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Feb 16 17:02:52 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Feb 17 15:45:01 2020 +0100

    disconnect damage when target window is destroyed
    
    Change-Id: I4b14ec12112e54bc913fe960808f0bbf8ba4bada
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88820
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index ee32281378be..3165067028d5 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3694,6 +3694,10 @@ void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )
     GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame);
     if( pObj == pThis->m_pWindow )
     {
+        pThis->m_aDamageHandler.damaged = nullptr;
+        pThis->m_aDamageHandler.handle = nullptr;
+        if (pThis->m_pSurface)
+            cairo_surface_set_user_data(pThis->m_pSurface, SvpSalGraphics::getDamageKey(), nullptr, nullptr);
         pThis->m_pFixedContainer = nullptr;
         pThis->m_pEventBox = nullptr;
         pThis->m_pTopLevelGrid = nullptr;