diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-01-15 09:07:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-15 09:07:03 +0100 |
| commit | f6584b0131c6db4b3cfbca0639b07838e69514c5 (patch) | |
| tree | 12941c4b83a96228100cbe109a451cd0fc835512 /default-plugins/session-manager | |
| parent | fix: center floating panes when width/height but no x/y are provided (#4607) (diff) | |
| download | sl0ppij-f6584b0131c6db4b3cfbca0639b07838e69514c5.tar.gz sl0ppij-f6584b0131c6db4b3cfbca0639b07838e69514c5.tar.xz sl0ppij-f6584b0131c6db4b3cfbca0639b07838e69514c5.zip | |
fix: properly quit welcome screen when switching sessions (#4605)
* fix: properly quit welcome screen when switching sessions
* fix tests and add PR to changelog
Diffstat (limited to 'default-plugins/session-manager')
| -rw-r--r-- | default-plugins/session-manager/src/main.rs | 18 | ||||
| -rw-r--r-- | default-plugins/session-manager/src/new_session_info.rs | 17 |
2 files changed, 29 insertions, 6 deletions
diff --git a/default-plugins/session-manager/src/main.rs b/default-plugins/session-manager/src/main.rs index 5c014779..c89b0049 100644 --- a/default-plugins/session-manager/src/main.rs +++ b/default-plugins/session-manager/src/main.rs @@ -60,6 +60,7 @@ impl ZellijPlugin for State { if self.is_welcome_screen { self.active_screen = ActiveScreen::NewSession; } + self.new_session_info.is_welcome_screen = self.is_welcome_screen; subscribe(&[ EventType::ModeUpdate, EventType::SessionUpdate, @@ -529,11 +530,11 @@ impl State { self.search_term.clear(); self.sessions .update_search_term(&self.search_term, &self.colors); - if !self.is_welcome_screen { - // we usually don't want to hide_self() if we're the welcome screen because - // unless the user did something odd like opening an extra pane/tab in the - // welcome screen, this will result in the current session closing, as this is - // the last selectable pane... + if self.is_welcome_screen { + // the welcome screen has done its job and now we need to quit this temporary + // session so as not to leave garbage sessions behind + quit_zellij(); + } else { hide_self(); } }, @@ -542,6 +543,13 @@ impl State { self.resurrectable_sessions.get_selected_session_name() { switch_session(Some(&session_name_to_resurrect)); + if self.is_welcome_screen { + // the welcome screen has done its job and now we need to quit this temporary + // session so as not to leave garbage sessions behind + quit_zellij(); + } else { + hide_self(); + } } }, } diff --git a/default-plugins/session-manager/src/new_session_info.rs b/default-plugins/session-manager/src/new_session_info.rs index a6ff7901..cc8c4af0 100644 --- a/default-plugins/session-manager/src/new_session_info.rs +++ b/default-plugins/session-manager/src/new_session_info.rs @@ -8,6 +8,7 @@ pub struct NewSessionInfo { name: String, layout_list: LayoutList, entering_new_session_info: EnteringState, + pub is_welcome_screen: bool, pub new_session_folder: Option<PathBuf>, } @@ -106,10 +107,24 @@ impl NewSessionInfo { match new_session_layout { Some(new_session_layout) => { let cwd = self.new_session_folder.as_ref().map(|c| PathBuf::from(c)); - switch_session_with_layout(new_session_name, new_session_layout, cwd) + switch_session_with_layout(new_session_name, new_session_layout, cwd); + if self.is_welcome_screen { + // the welcome screen has done its job and now we need to quit this temporary + // session so as not to leave garbage sessions behind + quit_zellij(); + } else { + hide_self(); + } }, None => { switch_session(new_session_name); + if self.is_welcome_screen { + // the welcome screen has done its job and now we need to quit this temporary + // session so as not to leave garbage sessions behind + quit_zellij(); + } else { + hide_self(); + } }, } } |
