From 63cf48daa581ce71de00d3878e2941bca1e22fbf Mon Sep 17 00:00:00 2001
From: LGUG2Z <jadeiqbal@fastmail.com>
Date: Sat, 18 Sep 2021 12:26:18 -0700
Subject: [PATCH] fix(wm): ensure idx < len before container removal

fix #38
---
 komorebi/src/workspace.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/komorebi/src/workspace.rs b/komorebi/src/workspace.rs
index 6149bb44..68803115 100644
--- a/komorebi/src/workspace.rs
+++ b/komorebi/src/workspace.rs
@@ -340,8 +340,15 @@ impl Workspace {
     }
 
     fn remove_container_by_idx(&mut self, idx: usize) -> Option<Container> {
-        self.resize_dimensions_mut().remove(idx);
-        self.containers_mut().remove(idx)
+        if idx < self.resize_dimensions().len() {
+            self.resize_dimensions_mut().remove(idx);
+        }
+
+        if idx < self.containers().len() {
+            return self.containers_mut().remove(idx);
+        }
+
+        None
     }
 
     fn container_idx_for_window(&self, hwnd: isize) -> Option<usize> {