Merge pull request #890 from agx/layer-shell-empty-output-crash

layer-shell: Fix crash when cursor is intially outside any output

1 files changed, 12 insertions, 2 deletions

diff --git a/rootston/layer_shell.c b/rootston/layer_shell.c
index 836deb42..db0aeb59 100644
--- a/rootston/layer_shell.c
+++ b/rootston/layer_shell.c
@@ -395,8 +395,18 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
 			wlr_output_layout_output_at(desktop->layout,
 					seat->cursor->cursor->x,
 					seat->cursor->cursor->y);
-		assert(output); // And this one
-		layer_surface->output = output;
+		if (!output) {
+			wlr_log(L_ERROR, "Couldn't find output at (%.0f,%.0f)",
+				seat->cursor->cursor->x,
+				seat->cursor->cursor->y);
+			output = wlr_output_layout_get_center_output(desktop->layout);
+		}
+		if (output) {
+			layer_surface->output = output;
+		} else {
+			wlr_layer_surface_close(layer_surface);
+			return;
+		}
 	}
 
 	roots_surface->surface_commit.notify = handle_surface_commit;