From 6b63516890a77ce61a9670510a730811c02a3b09 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Thu, 22 Sep 2022 08:07:46 +0200
Subject: Wayland: fix error detection during call to glewInit().

---
 examples/OpenGL3-glut-test.cxx | 2 +-
 examples/OpenGL3test.cxx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/OpenGL3-glut-test.cxx b/examples/OpenGL3-glut-test.cxx
index 31639b545..4a8994c9f 100644
--- a/examples/OpenGL3-glut-test.cxx
+++ b/examples/OpenGL3-glut-test.cxx
@@ -200,7 +200,7 @@ int main (int argc, char* argv[])
 #ifndef __APPLE__
   GLenum err = glewInit(); // defines pters to functions of OpenGL V 1.2 and above
 #ifdef FLTK_USE_WAYLAND
-  if (err == GLEW_ERROR_NO_GLX_DISPLAY) err = GLEW_OK;
+  if (fl_wl_display() && err == GLEW_ERROR_NO_GLX_DISPLAY) err = GLEW_OK;
 #endif
   if (err != GLEW_OK) Fl::error("glewInit() failed returning %u", err);
   fprintf(stderr, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
diff --git a/examples/OpenGL3test.cxx b/examples/OpenGL3test.cxx
index 08c1711a5..9acbaf38b 100644
--- a/examples/OpenGL3test.cxx
+++ b/examples/OpenGL3test.cxx
@@ -149,7 +149,7 @@ public:
 #  ifdef FLTK_USE_WAYLAND
       // glewInit returns GLEW_ERROR_NO_GLX_DISPLAY with Wayland
       // see https://github.com/nigels-com/glew/issues/273
-      if (err == GLEW_ERROR_NO_GLX_DISPLAY) err = GLEW_OK;
+      if (fl_wl_display() && err == GLEW_ERROR_NO_GLX_DISPLAY) err = GLEW_OK;
 #  endif
       if (err) Fl::warning("glewInit() failed returning %u", err);
       else add_output("Using GLEW %s\n", glewGetString(GLEW_VERSION));
-- 
cgit v1.2.3