[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/unx

Michael Meeks michael at kemper.freedesktop.org
Mon Oct 3 12:06:22 PDT 2011


 vcl/unx/generic/gdi/gcach_xpeer.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f84207a787ce0f704958706e45ae4c6b26736c92
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Oct 3 20:06:35 2011 +0100

    gtk3: fix gtk2 crash-on-exit regression

diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index fdf01a2..f68314b 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -85,6 +85,9 @@ X11GlyphPeer::X11GlyphPeer()
 
 X11GlyphPeer::~X11GlyphPeer()
 {
+    if( !ImplGetSVData() )
+        return;
+
     SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     Display* const pX11Disp = pSalDisp->GetDisplay();
     XRenderPeer& rRenderPeer = XRenderPeer::GetInstance();


More information about the Libreoffice-commits mailing list