From 7b6a779fd3a911c25edf58efc36862c07202a5fa Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Sun, 11 Jan 2026 12:09:41 +0100
Subject: Fix "Wayland: NULL pointer dereference in Fl::cairo_make_current()"
 (#1359)

---
 src/Fl_Cairo.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Cairo.cxx b/src/Fl_Cairo.cxx
index c69af2c55..a5b471392 100644
--- a/src/Fl_Cairo.cxx
+++ b/src/Fl_Cairo.cxx
@@ -150,8 +150,8 @@ cairo_t *Fl::cairo_make_current(Fl_Window *wi) {
 #if defined(FLTK_USE_WAYLAND)
   if (fl_wl_display()) { // true means using wayland backend
     struct wld_window *xid = fl_wl_xid(wi);
-    if (!xid->buffer)
-      return NULL; // this may happen with GL windows
+    if (!xid || !xid->buffer)
+      return NULL; // this may happen with GL windows or if window is not shown
     cairo_ctxt = xid->buffer->draw_buffer.cairo_;
     Fl::Private::cairo_state_.cc(cairo_ctxt, false);
     return cairo_ctxt;
-- 
cgit v1.2.3