From 168f65fb7a336c7f7067bfd56413b2d19556c8bf Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 30 Mar 2018 18:28:21 -0400
Subject: [PATCH] Minor bugfixes

---
 examples/layer-shell.c | 1 +
 rootston/desktop.c     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/layer-shell.c b/examples/layer-shell.c
index 6e293f558..3f955be41 100644
--- a/examples/layer-shell.c
+++ b/examples/layer-shell.c
@@ -157,6 +157,7 @@ static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
 static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
 		uint32_t serial, struct wl_surface *surface) {
 	cur_x = cur_y = -1;
+	buttons = 0;
 }
 
 static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 45bf8105c..7ee2c69ae 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -694,6 +694,8 @@ struct wlr_surface *desktop_surface_at(struct roots_desktop *desktop,
 		wlr_output_layout_output_at(desktop->layout, lx, ly);
 	struct roots_output *roots_output;
 	double ox = lx, oy = ly;
+	*view = NULL;
+
 	if (wlr_output) {
 		roots_output = wlr_output->data;
 		wlr_output_layout_output_coords(desktop->layout, wlr_output, &ox, &oy);
@@ -710,7 +712,6 @@ struct wlr_surface *desktop_surface_at(struct roots_desktop *desktop,
 		}
 	}
 
-	*view = NULL;
 	struct roots_view *_view;
 	if ((_view = desktop_view_at(desktop, lx, ly, &surface, sx, sy))) {
 		if (view) {