Merge pull request #554 from AdaShoelace/main

Don't rename 'unnamed' tabs upon deletion of other tabs

2 files changed, 8 insertions, 5 deletions

diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index fb8e377d1..7e83e85bb 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -46,11 +46,7 @@ pub fn tab_style(
     capabilities: PluginCapabilities,
 ) -> LinePart {
     let separator = tab_separator(capabilities);
-    let mut tab_text = if text.is_empty() {
-        format!("Tab #{}", position + 1)
-    } else {
-        text
-    };
+    let mut tab_text = text;
     if is_sync_panes_active {
         tab_text.push_str(" (Sync)");
     }
diff --git a/zellij-server/src/tab.rs b/zellij-server/src/tab.rs
index 7daf20925..e1bbf2e54 100644
--- a/zellij-server/src/tab.rs
+++ b/zellij-server/src/tab.rs
@@ -255,6 +255,13 @@ impl Tab {
         } else {
             BTreeMap::new()
         };
+
+        let name = if name.is_empty() {
+            format!("Tab #{}", position + 1)
+        } else {
+            name
+        };
+
         Tab {
             index,
             position,