[Libreoffice-commits] core.git: Branch 'feature/kde5' - vcl/unx

[Katarina Behrens]

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

New commits:
commit 42d22e4056361bf0abcbfd557f2c688643cda967
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Wed Oct 4 21:57:56 2017 +0200

    Avoid crash with null surface
    
    Change-Id: Ie63e62995bee0fd950cea0668f5ae06c903b25a3

diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index a58c2d3723f1..5a15b6fb2592 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -340,7 +340,8 @@ void KDE5SalFrame::ReleaseGraphics( SalGraphics *pGraphics )
         if( m_aGraphics[i].pGraphics.get() == pGraphics )
         {
             m_aGraphics[i].bInUse = false;
-            cairo_surface_destroy( m_aGraphics[i].pSurface );
+            if ( m_aGraphics[i].pSurface != nullptr )
+                cairo_surface_destroy( m_aGraphics[i].pSurface );
             break;
         }
     }