Skip to content

Commit 3d47152

Browse files
fix: resolve merge conflicts from main
- Fix borrow checker error in detach state handling by copying byte value before mutating state - Remove unused MouseEventKind import 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 6998416 commit 3d47152

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

packages/multiplexer/src/tui/events.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,10 @@ async fn handle_attached_key(app: &mut App, key: KeyEvent) -> anyhow::Result<()>
732732
DetachState::Pending { since, key_byte: pending_byte } => {
733733
if since.elapsed() < DETACH_TIMEOUT {
734734
// Double-tap detected - send the literal key that was pressed
735+
// Copy the byte value before we mutate detach_state
736+
let byte_to_send = *pending_byte;
735737
app.detach_state = DetachState::Idle;
736-
app.send_to_pty(vec![*pending_byte]).await?;
738+
app.send_to_pty(vec![byte_to_send]).await?;
737739
} else {
738740
// Timeout expired - this should have been handled by main loop
739741
// but if we get here, treat as detach

packages/multiplexer/src/tui/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::time::Duration;
1313
use crossterm::{
1414
event::{
1515
DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
16-
Event, KeyCode, KeyboardEnhancementFlags, MouseEventKind, PopKeyboardEnhancementFlags,
16+
Event, KeyCode, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags,
1717
PushKeyboardEnhancementFlags,
1818
},
1919
execute,

0 commit comments

Comments
 (0)