shell: don't assign output for surface of type none

If map is called with a surface of type none it will call
weston_surface_assign_output, even though the surface will
not be mapped.

This change was lost with the changes for using wl_layers.

diff --git a/src/shell.c b/src/shell.c
index f942cf9..92b7540 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1582,10 +1582,12 @@ map(struct weston_shell *base, struct weston_surface *surface,
                break;
        }
 
-       weston_surface_assign_output(surface);
-       weston_compositor_repick(compositor);
-       if (surface_type == SHELL_SURFACE_MAXIMIZED)
-               surface->output = shsurf->output;
+       if (surface_type != SHELL_SURFACE_NONE) {
+               weston_surface_assign_output(surface);
+               weston_compositor_repick(compositor);
+               if (surface_type == SHELL_SURFACE_MAXIMIZED)
+                       surface->output = shsurf->output;
+       }
 
        switch (surface_type) {
        case SHELL_SURFACE_TOPLEVEL: