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-11 22:53:52 +0000 |
| commit | 6c0e9a5bdd72bf4c9b51e9edcd44776f1595f826 (patch) | |
| tree | dd777d893c241944116a596afe467b8400eabedf /vcl | |
| parent | 131c8d9e7349ab82b38616b271b40c3149dde8fa (diff) | |
vcl: gtk frames should DeInitialize properly, to handle GL cleanup.
Conflicts:
vcl/unx/gtk/gtksalframe.cxx
Change-Id: Ie6a5464c28b89f08639939690052023e685a3d33
Diffstat (limited to 'vcl')
| -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 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 ) |