diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-11-30 16:13:42 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-12-10 12:01:31 +0000 |
| commit | b52c240364d50292d4faa234699e5851a25764df (patch) | |
| tree | bf68aa74d4a0778a21f2982dfeab097cf6b3b6a0 | |
| parent | 484cee0e0c655cf1fc1bff4758e4eb6e4dd0184e (diff) | |
vcl: gtk frames should DeInitialize properly, to handle GL cleanup.
Change-Id: Ie6a5464c28b89f08639939690052023e685a3d33
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 085eb0e22f56..177299024c5b 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -777,8 +777,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; } } @@ -846,9 +848,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 = nullptr; } void GtkSalFrame::moveWindow( long nX, long nY ) |