From c3d0599a6eba492b0739d57ebd37d4f1a4eceb0f Mon Sep 17 00:00:00 2001 From: Ali Ghaffaari Date: Sun, 19 Dec 2021 12:46:07 +0100 Subject: [PATCH] Fix #141 The issue apprently happens when using fish as the default shell. This commit fixes this issue by postponing `restore/pane_contents` clean-up after calling `restore_active_pane_for_each_window` (scripts/restore.sh:392). It might also fix #192. --- scripts/restore.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/restore.sh b/scripts/restore.sh index 47907bc..835e42c 100755 --- a/scripts/restore.sh +++ b/scripts/restore.sh @@ -270,9 +270,6 @@ restore_all_panes() { restore_pane "$line" fi done < $(last_resurrect_file) - if is_restoring_pane_contents; then - rm "$(pane_contents_dir "restore")"/* - fi } handle_session_0() { @@ -375,6 +372,12 @@ restore_active_and_alternate_sessions() { done < $(last_resurrect_file) } +cleanup_restored_pane_contents() { + if is_restoring_pane_contents; then + rm "$(pane_contents_dir "restore")"/* + fi +} + main() { if supported_tmux_version_ok && check_saved_session_exists; then start_spinner "Restoring..." "Tmux restore complete!" @@ -394,6 +397,7 @@ main() { restore_grouped_sessions # also restores active and alt windows for grouped sessions restore_active_and_alternate_windows restore_active_and_alternate_sessions + cleanup_restored_pane_contents execute_hook "post-restore-all" stop_spinner display_message "Tmux restore complete!"