summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-03-29 01:08:39 +0000
committerMatthias Clasen <mclasen@redhat.com>2023-03-29 01:08:39 +0000
commitb497382659d45d3c71ad5804f0bc19ccdead389a (patch)
treef6a0f1e7fb94a14bf366a54085b3c38b4a5b3f66
parent1afbe2d08b78e095b871ded71e25682851aefa09 (diff)
parentd8190aae3ff2f0a63a8fb72922fb117b5ab34b6a (diff)
downloadgtk+-b497382659d45d3c71ad5804f0bc19ccdead389a.tar.gz
Merge branch 'mcatanzaro/fix-xdg-activation' into 'gtk-3-24'
wayland: Don't crash without xdg_activation_v1 See merge request GNOME/gtk!5743
-rw-r--r--gdk/wayland/gdkwindow-wayland.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 619f7982cb..9c0264e71b 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -4179,7 +4179,7 @@ gdk_wayland_window_set_startup_id (GdkWindow *window,
}
#ifdef HAVE_XDG_ACTIVATION
- if (startup_id)
+ if (display_wayland->xdg_activation && startup_id)
{
xdg_activation_v1_activate (display_wayland->xdg_activation,
startup_id,