diff options
| author | Yuri Sizov <yuris@humnom.net> | 2023-07-12 15:09:14 +0200 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-07-12 15:09:14 +0200 |
| commit | 2b47f6715e7df588a30ac665aac60e22c67e62ca (patch) | |
| tree | 37b650734b0c4810b30108761222befdc93b0c10 /platform/linuxbsd | |
| parent | b54d6cf46657dccd5b66cc1661a2ce0a6d99e1d7 (diff) | |
| parent | 9c5a0c6c102556c229825e053153d02fb7141668 (diff) | |
| download | redot-engine-2b47f6715e7df588a30ac665aac60e22c67e62ca.tar.gz | |
Merge pull request #78437 from bruvzg/set_icon
Add error checks and harmonize behavior of the `set_icon` method.
Diffstat (limited to 'platform/linuxbsd')
| -rw-r--r-- | platform/linuxbsd/x11/display_server_x11.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index d9e18720dc..bdb160e6a6 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -4880,6 +4880,8 @@ void DisplayServerX11::set_icon(const Ref<Image> &p_icon) { Atom net_wm_icon = XInternAtom(x11_display, "_NET_WM_ICON", False); if (p_icon.is_valid()) { + ERR_FAIL_COND(p_icon->get_width() <= 0 || p_icon->get_height() <= 0); + Ref<Image> img = p_icon->duplicate(); img->convert(Image::FORMAT_RGBA8); |