[PATCH] shell: Do not insert input panel layer when locked

Jan Arne Petersen jpetersen at openismus.com
Wed Nov 7 06:32:54 PST 2012


From: Jan Arne Petersen <jpetersen at openismus.com>

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 at openismus.com>
---
 src/shell.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/shell.c b/src/shell.c
index b28353e..d4662ef 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -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) {
-- 
1.7.11.7



More information about the wayland-devel mailing list