[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Oct 15 14:12:38 UTC 2019


 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit dae5b97931eb12645565e2ad77b30b5b1c9f9b9c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 15 14:06:51 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 15 16:11:22 2019 +0200

    Related: tdf#124729 check for gtk_gl_area_get_error before continuing
    
    Change-Id: Ib87f32c2fa8c561981920ea688ea723c8e59bead
    Reviewed-on: https://gerrit.libreoffice.org/80836
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b8ceadda4e0c..f1de1bbfbacb 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1475,6 +1475,10 @@ private:
         gtk_widget_show_all(pParent);
 
         gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea));
+
+        if (gtk_gl_area_get_error(GTK_GL_AREA(m_pGLArea)))
+            return false;
+
         gtk_gl_area_attach_buffers(GTK_GL_AREA(m_pGLArea));
         glGenFramebuffersEXT(1, &m_nAreaFrameBuffer);
 


More information about the Libreoffice-commits mailing list