From: Johan Malm <jgm323@gmail.com>
Date: Wed, 10 Jun 2020 15:48:25 +0000 (+0100)
Subject: view.c: next_toplevel(): handle NULL pointer
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=49d2e029aae7f1e624683d44fc633ba38a50dea5;p=proto%2Flabwc.git

view.c: next_toplevel(): handle NULL pointer
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 41906faa..6a08c86e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -36,7 +36,6 @@ static bool handle_keybinding(struct server *server, xkb_keysym_t sym)
 	case XKB_KEY_F1:
 	case XKB_KEY_F2:
 		server->cycle_view = next_toplevel(view_front_toplevel(server));
-		fprintf(stderr, "cycle_view=%p\n", (void *)server->cycle_view);
 		break;
 	case XKB_KEY_F3:
 		if (fork() == 0) {
diff --git a/src/view.c b/src/view.c
index 87d395ea..271e0363 100644
--- a/src/view.c
+++ b/src/view.c
@@ -175,7 +175,8 @@ struct view *view_front_toplevel(struct server *server)
 
 struct view *next_toplevel(struct view *current)
 {
-	/* FIXME: write nr_toplevels() */
+	if (!current)
+		return NULL;
 	struct view *view = current;
 	do {
 		view = wl_container_of(view->link.next, view, link);