1 files changed, 3 insertions, 4 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 913c7200d..95aff3d3e 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1902,12 +1902,11 @@ void Fl_Window::make_current() {
 #endif
 }
 
-Window fl_xid_(const Fl_Window* w)
-{
-  return Fl_X::i(w)->xid;
+Window fl_xid_(const Fl_Window *w) {
+  Fl_X *temp = Fl_X::i(w);
+  return temp ? temp->xid : 0;
 }
 
-
 int Fl_Window::decorated_h()
 {
   if (parent() || !shown()) return h();