From 85f38c06d094ba77ac7215331005fefe1c9c4e01 Mon Sep 17 00:00:00 2001
From: Isaac Freund <ifreund@ifreund.xyz>
Date: Fri, 8 May 2020 20:13:02 +0200
Subject: [PATCH] Fix broken crashy behavior of zoom

---
 src/command/zoom.zig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/command/zoom.zig b/src/command/zoom.zig
index 5a5ca93..b1f7ba6 100644
--- a/src/command/zoom.zig
+++ b/src/command/zoom.zig
@@ -29,8 +29,9 @@ pub fn zoom(seat: *Seat, arg: Arg) void {
         const output = seat.focused_output;
         const focused_node = @fieldParentPtr(ViewStack(View).Node, "view", current_focus);
 
-        const zoom_node = if (focused_node == output.views.first)
-            if (focused_node.next) |second| second else null
+        var it = ViewStack(View).iterator(output.views.first, output.current_focused_tags);
+        const zoom_node = if (focused_node == it.next())
+            if (it.next()) |second| second else null
         else
             focused_node;