view.c: next_toplevel(): handle NULL pointer

diff --git a/src/keyboard.c b/src/keyboard.c
index 41906faaad6dfd7f1801bb70cbf3fb16c791beb7..6a08c86efddbb167bf635b3dd8a6903a80499705 100644 (file)
--- 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 87d395eabb36fbfb0e98b794857a02533c841b6b..271e03633794307fd2d57112920e68b7b811864a 100644 (file)
--- 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);