aboutsummaryrefslogtreecommitdiffstats
path: root/zellij-client
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2026-03-21 20:19:37 +0100
committerGitHub <noreply@github.com>2026-03-21 20:19:37 +0100
commita6a6440614efb1cddbc51f01633787cdd117056c (patch)
tree00c1ba33ffe48afc22269a2f2575cc5bc95aafb5 /zellij-client
parentAdd windows support in strider (#4854) (diff)
downloadsl0ppij-a6a6440614efb1cddbc51f01633787cdd117056c.tar.gz
sl0ppij-a6a6440614efb1cddbc51f01633787cdd117056c.tar.xz
sl0ppij-a6a6440614efb1cddbc51f01633787cdd117056c.zip
Fix cli blocking logic and update dependencies (#4881)
* fix: do not unblock blocking commands for other unblock conditions * update deps * allow trailing : in file path detection and change log format to match
Diffstat (limited to 'zellij-client')
-rw-r--r--zellij-client/src/cli_client.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/zellij-client/src/cli_client.rs b/zellij-client/src/cli_client.rs
index 83f9e607..22fd6c74 100644
--- a/zellij-client/src/cli_client.rs
+++ b/zellij-client/src/cli_client.rs
@@ -208,6 +208,13 @@ fn individual_messages_client(
action: Action,
pane_id: Option<u32>,
) {
+ let is_blocking = matches!(
+ &action,
+ Action::NewBlockingPane {
+ unblock_condition: Some(_),
+ ..
+ }
+ );
let msg = ClientToServerMsg::Action {
action,
terminal_id: pane_id,
@@ -217,7 +224,7 @@ fn individual_messages_client(
os_input.send_to_server(msg);
loop {
match os_input.recv_from_server() {
- Some((ServerToClientMsg::UnblockInputThread, _)) => {
+ Some((ServerToClientMsg::UnblockInputThread, _)) if !is_blocking => {
break;
},
Some((ServerToClientMsg::Log { lines: log_lines }, _)) => {