shell: Do not insert input panel layer when locked
authorJan Arne Petersen <jpetersen@openismus.com>
Wed, 7 Nov 2012 14:32:54 +0000 (15:32 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 8 Nov 2012 16:45:09 +0000 (11:45 -0500)
Do not try to insert the input panel layer in the layer list when the
shell is locked in show_input_panels(). The layer will already be
insrted in resume_desktop() anyways.

https://bugs.freedesktop.org/show_bug.cgi?id=56543

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
src/shell.c

index b28353e..d4662ef 100644 (file)
@@ -2780,8 +2780,9 @@ show_input_panels(struct wl_listener *listener, void *data)
 
        shell->showing_input_panels = true;
 
-       wl_list_insert(&shell->panel_layer.link,
-                      &shell->input_panel_layer.link);
+       if (!shell->locked)
+               wl_list_insert(&shell->panel_layer.link,
+                              &shell->input_panel_layer.link);
 
        wl_list_for_each_safe(surface, next,
                              &shell->input_panel.surfaces, link) {