diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-08 17:59:06 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-11-05 19:47:37 +0100 |
| commit | 4b945a3086011b6a59b5aef434cdbe8cda96c2de (patch) | |
| tree | 333de7fbb01ae280eb95728ad26ff1f366963054 /src/Fl_x.cxx | |
| parent | b426a3d7c07c9ffd53141ebd03dcd5e82ff4e52a (diff) | |
Wayland/X11 hybrid: use "bool fl_disable_wayland;" declaration.
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 37a9dbc71..1f1b16ba7 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2562,7 +2562,8 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) Fl_Window::show_iconic_ = 0; showit = 0; } - if (Fl_X11_Window_Driver::driver(win)->icon_->legacy_icon) { + if (Fl_X11_Window_Driver::driver(win)->icon_ && + Fl_X11_Window_Driver::driver(win)->icon_->legacy_icon) { hints->icon_pixmap = (Pixmap)Fl_X11_Window_Driver::driver(win)->icon_->legacy_icon; hints->flags |= IconPixmapHint; } @@ -2761,7 +2762,7 @@ void Fl_X11_Window_Driver::set_icons() { unsigned long *net_wm_icons; size_t net_wm_icons_size; - if (icon_->count) { + if (icon_ && icon_->count) { icons_to_property((const Fl_RGB_Image **)icon_->icons, icon_->count, &net_wm_icons, &net_wm_icons_size); } else { @@ -2772,7 +2773,7 @@ void Fl_X11_Window_Driver::set_icons() { XChangeProperty (fl_display, fl_xid(pWindow), fl_NET_WM_ICON, XA_CARDINAL, 32, PropModeReplace, (unsigned char*) net_wm_icons, net_wm_icons_size); - if (icon_->count) { + if (icon_ && icon_->count) { delete [] net_wm_icons; net_wm_icons = 0L; net_wm_icons_size = 0; |