diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-02-20 11:48:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-20 11:48:42 +0100 |
| commit | 238f72ad5c1b4cee8760668bf7cf6058a3eb3889 (patch) | |
| tree | d5e8d8ec4d00d55192f63bc8aaeea67b44834233 | |
| parent | fix: do not attempt to reconnect from the web if kicked from the session (#4730) (diff) | |
| download | sl0ppij-238f72ad5c1b4cee8760668bf7cf6058a3eb3889.tar.gz sl0ppij-238f72ad5c1b4cee8760668bf7cf6058a3eb3889.tar.xz sl0ppij-238f72ad5c1b4cee8760668bf7cf6058a3eb3889.zip | |
fix: go to welcome screen when opening web root (#4736)
| -rw-r--r-- | zellij-client/src/web_client/server_listener.rs | 3 | ||||
| -rw-r--r-- | zellij-client/src/web_client/session_management.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/zellij-client/src/web_client/server_listener.rs b/zellij-client/src/web_client/server_listener.rs index c93a281a..4d2b6b7b 100644 --- a/zellij-client/src/web_client/server_listener.rs +++ b/zellij-client/src/web_client/server_listener.rs @@ -47,6 +47,7 @@ pub fn zellij_server_listener( let mut attachment_complete_tx = attachment_complete_tx; 'reconnect_loop: loop { let reconnect_info = reconnect_to_session.take(); + let initial_layout = reconnect_info.as_ref().and_then(|r| r.layout.clone()); let path = { let Some(session_name) = reconnect_info .as_ref() @@ -102,7 +103,7 @@ pub fn zellij_server_listener( } let should_create_new_session = !session_exists; - let first_message = create_first_message(is_read_only, config_file_path.clone(), client_attributes.clone(), config_options.clone(), should_create_new_session, &session_name); + let first_message = create_first_message(is_read_only, config_file_path.clone(), client_attributes.clone(), config_options.clone(), should_create_new_session, &session_name, initial_layout); let zellij_ipc_pipe = create_ipc_pipe(&session_name); session_manager.spawn_session_if_needed( diff --git a/zellij-client/src/web_client/session_management.rs b/zellij-client/src/web_client/session_management.rs index 9530ba94..936b4c87 100644 --- a/zellij-client/src/web_client/session_management.rs +++ b/zellij-client/src/web_client/session_management.rs @@ -62,6 +62,7 @@ pub fn create_first_message( mut config_opts: Options, should_create_session: bool, session_name: &str, + initial_layout: Option<LayoutInfo>, ) -> ClientToServerMsg { let resurrection_layout = resurrection_layout(&session_name).ok().flatten(); @@ -73,7 +74,7 @@ pub fn create_first_message( LayoutMetadata::default(), )) } else { - None + initial_layout }; config_opts.web_server = Some(true); |