[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit bfba5d9e98a4160e53eb07e806c19e30cc8e6947
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Oct 13 20:48:14 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 14 14:40:15 2019 +0200

    Related: tdf#124729 check error status before continuing
    
    Change-Id: Ic39e569121b2646995b8dec50c3941db65fdd500
    Reviewed-on: https://gerrit.libreoffice.org/80745
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit fb098c51e731ab92198db9822d4de757469ee804)
    Reviewed-on: https://gerrit.libreoffice.org/80753
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7c423fb4a272..5161c4dd9b89 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1070,7 +1070,12 @@ private:
 
         GdkWindow *pWindow = gtk_widget_get_window(pParent);
         m_pContext = gdk_window_create_gl_context(pWindow, nullptr);
-        gdk_gl_context_realize(m_pContext, nullptr);
+        if (!m_pContext)
+            return false;
+
+        if (!gdk_gl_context_realize(m_pContext, nullptr))
+            return false;
+
         gdk_gl_context_make_current(m_pContext);
         glGenFramebuffersEXT(1, &m_nFrameBuffer);
         glGenRenderbuffersEXT(1, &m_nRenderBuffer);