Merge pull request #2459 from RyanDwyer/fix-workspace-prev-next

Use list_find in more places and refactor/fix workspace prev_next functions

1 files changed, 3 insertions, 5 deletions

diff --git a/sway/tree/root.c b/sway/tree/root.c
index 79f2194e..a974a461 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -84,11 +84,9 @@ void root_scratchpad_remove_container(struct sway_container *con) {
 		return;
 	}
 	con->scratchpad = false;
-	for (int i = 0; i < root_container.sway_root->scratchpad->length; ++i) {
-		if (root_container.sway_root->scratchpad->items[i] == con) {
-			list_del(root_container.sway_root->scratchpad, i);
-			break;
-		}
+	int index = list_find(root_container.sway_root->scratchpad, con);
+	if (index != -1) {
+		list_del(root_container.sway_root->scratchpad, index);
 	}
 }