Skip to content

fix: avoid double-borrow panic on rapid Ctrl+Tab tab switching #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ferdinankurnian wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: avoid double-borrow panic on rapid Ctrl+Tab tab switching #113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 27 additions & 18 deletions rust/limux-host-linux/src/pane.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2961,29 +2961,38 @@ fn activate_tab(
tab_state: &Rc<RefCell<TabState>>,
tab_id: &str,
) {
let mut ts = tab_state.borrow_mut();
ts.active_tab = Some(tab_id.to_string());

// Update visual state on all tabs
for entry in &ts.tabs {
if entry.id == tab_id {
entry.tab_button.add_css_class("limux-tab-active");
} else {
entry.tab_button.remove_css_class("limux-tab-active");
let (focus_target, has_content_child) = {
let mut ts = tab_state.borrow_mut();
ts.active_tab = Some(tab_id.to_string());

// Update visual state on all tabs
for entry in &ts.tabs {
if entry.id == tab_id {
entry.tab_button.add_css_class("limux-tab-active");
} else {
entry.tab_button.remove_css_class("limux-tab-active");
}
}
}

if content_stack.child_by_name(tab_id).is_some() {
let focus_target = ts
.tabs
.iter()
.find(|entry| entry.id == tab_id)
.map(TabFocusTarget::from_entry);

(focus_target, content_stack.child_by_name(tab_id).is_some())

@bvolpato bvolpato Jul 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non-blocking: move child_by_name() below this scope. Current comment says content_stack is untouched until ts drops, but this query still runs under borrow_mut(). It is likely signal-free; keeping all stack calls outside makes reentrancy boundary explicit.

// `ts` (the RefCell borrow_mut guard) is dropped here, before we touch
// content_stack. set_visible_child_name() synchronously fires GTK
// unmap/map signals (hover-out on the old surface, etc.), and those
// handlers can re-enter tab_state.borrow() (e.g. tab_rename_active).
// Holding the mutable borrow across that call caused a double-borrow
// panic on rapid repeated tab switches (Ctrl+Tab x2-4 fast).
};

if has_content_child {
content_stack.set_visible_child_name(tab_id);
}

let focus_target = ts
.tabs
.iter()
.find(|entry| entry.id == tab_id)
.map(TabFocusTarget::from_entry);
drop(ts);

if let Some(target) = focus_target {
// Mouse-initiated tab switches can leave focus on the click target if we
// refocus synchronously. Deferring to the next idle tick makes the newly
Expand Down