Explain delayed pane content cleanup

Merge pull request #422 from cartoonist/master
Fix #141
2021-12-19 16:21:44 +01:00 · 2021-12-19 16:19:30 +01:00 · 2021-12-19 12:50:20 +01:00
1 changed files with 9 additions and 3 deletions
--- 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,14 @@ restore_active_and_alternate_sessions() {
 	done < $(last_resurrect_file)
 }

+# A cleanup that happens after 'restore_all_panes' seems to fix fish shell
+# users' restore problems.
+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 +399,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!"
Author	SHA1	Message	Date
Bruno Sutic	027960ad25	Explain delayed pane content cleanup	2021-12-19 16:21:44 +01:00
Bruno Sutic	dc6252d950	Merge pull request #422 from cartoonist/master Fix #141	2021-12-19 16:19:30 +01:00
Ali Ghaffaari	c3d0599a6e	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.	2021-12-19 12:50:20 +01:00