From c3950699bf200ff42a7336a7a238592bd818efbe Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 13 Aug 2014 18:09:55 -0400
Subject: [PATCH] wayland: Don't assert fail when dealing with popup windows

---
 src/wayland/meta-wayland-surface.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 4ec565db4..996335374 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1838,6 +1838,11 @@ meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
           sent_serial->value = serial;
         }
     }
+  else if (surface->xdg_popup.resource)
+    {
+      /* This can happen if the popup window loses or receives focus.
+       * Just ignore it. */
+    }
   else if (surface->wl_shell_surface.resource)
     wl_shell_surface_send_configure (surface->wl_shell_surface.resource,
                                      0, new_width, new_height);