pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't send the server an exit signal when client panics (#1731)

Browse source 
* Don't send the server an exit signal when client crashes

* Update changelog
This commit is contained in:
raphCode 2022-09-14 17:33:46 +02:00 • committed by GitHub
parent 31d741263c
commit 65d12c4b9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased] ## [Unreleased]
* debugging: Improve error handling in screen thread (https://github.com/zellij-org/zellij/pull/1670) * debugging: Improve error handling in screen thread (https://github.com/zellij-org/zellij/pull/1670)
* fix: Server exits when client panics (https://github.com/zellij-org/zellij/pull/1731)
## [0.31.4] - 2022-09-09 ## [0.31.4] - 2022-09-09
* Terminal compatibility: improve vttest compliance (https://github.com/zellij-org/zellij/pull/1671) * Terminal compatibility: improve vttest compliance (https://github.com/zellij-org/zellij/pull/1671)

3
zellij-client/src/lib.rs
View file

@ -26,7 +26,7 @@ use zellij_utils::{
data::{ClientId, InputMode, Style}, data::{ClientId, InputMode, Style},
envs, envs,
errors::{ClientContext, ContextType, ErrorInstruction}, errors::{ClientContext, ContextType, ErrorInstruction},
input::{actions::Action, config::Config, options::Options}, input::{config::Config, options::Options},
ipc::{ClientAttributes, ClientToServerMsg, ExitReason, ServerToClientMsg}, ipc::{ClientAttributes, ClientToServerMsg, ExitReason, ServerToClientMsg},
termwiz::input::InputEvent, termwiz::input::InputEvent,
}; };
@ -356,7 +356,6 @@ pub fn start_client(
break; break;
}, },
ClientInstruction::Error(backtrace) => { ClientInstruction::Error(backtrace) => {
let _ = os_input.send_to_server(ClientToServerMsg::Action(Action::Quit, None));
handle_error(backtrace); handle_error(backtrace);
}, },
ClientInstruction::Render(output) => { ClientInstruction::Render(output) => {