diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-04-13 17:20:05 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-04-13 17:20:05 -0400 |
| commit | bb4fca24863864dc2d7c4030ee8ae2c324a0b79e (patch) | |
| tree | ab5088e353954caa35bb19476eb49e5387305eee /gdk | |
| parent | 83e104b093f49ea452c25c370ce85cd247be4614 (diff) | |
| download | gtk+-bb4fca24863864dc2d7c4030ee8ae2c324a0b79e.tar.gz | |
wayland: Don't get the shell surface twice
Noticed by Pu Xingyu,
https://bugzilla.gnome.org/show_bug.cgi?id=697947
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/wayland/gdkwindow-wayland.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 4b651d792d..a04915e161 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -714,7 +714,9 @@ gdk_wayland_window_show (GdkWindow *window, gboolean already_mapped) wl_surface_set_user_data(impl->surface, window); } - if (!impl->use_custom_surface && display_wayland->shell) + if (!impl->shell_surface && + !impl->use_custom_surface && + display_wayland->shell) { impl->shell_surface = wl_shell_get_shell_surface (display_wayland->shell, impl->surface); |