From cdc03a2b41e1042685ac0f36c5abb352b5220f3b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 30 Nov 2015 16:13:42 +0000 Subject: vcl: gtk frames should DeInitialize properly, to handle GL cleanup. Conflicts: vcl/unx/gtk/gtksalframe.cxx Change-Id: Ie6a5464c28b89f08639939690052023e685a3d33 --- vcl/unx/gtk/gtksalframe.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 709c04e9a305..1d5c8974693b 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -773,8 +773,10 @@ void GtkSalFrame::InvalidateGraphics() { if( m_pGraphics ) { - m_pGraphics->SetDrawable( None, m_nXScreen ); + m_pGraphics->DeInit(); m_pGraphics->SetWindow(nullptr); + delete m_pGraphics; + m_pGraphics = nullptr; m_bGraphics = false; } } @@ -842,9 +844,6 @@ GtkSalFrame::~GtkSalFrame() g_object_unref( G_OBJECT( m_pForeignParent ) ); if( m_pForeignTopLevel ) g_object_unref( G_OBJECT( m_pForeignTopLevel) ); - - delete m_pGraphics; - m_pGraphics = NULL; } void GtkSalFrame::moveWindow( long nX, long nY ) -- cgit v1.2.3