Skip to content

Commit a516947

Browse files
committed
Sets pane_title at the end of restore_pane().
Otherwise it has to be called in new_pane(), new_window() and new_session() and once again after the very first pane is killed. This covers all cases.
1 parent 4a3b59c commit a516947

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

scripts/restore.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,13 @@ new_pane() {
171171
local window_number="$2"
172172
local dir="$3"
173173
local pane_index="$4"
174-
local pane_title="$5"
175174
local pane_id="${session_name}:${window_number}.${pane_index}"
176175
if is_restoring_pane_contents && pane_contents_file_exists "$pane_id"; then
177176
local pane_creation_command="$(pane_creation_command "$session_name" "$window_number" "$pane_index")"
178177
tmux split-window -t "${session_name}:${window_number}" -c "$dir" "$pane_creation_command"
179178
else
180179
tmux split-window -t "${session_name}:${window_number}" -c "$dir"
181180
fi
182-
set_pane_title "${session_name}" "${window_number}" "${pane_index}" "${pane_title}"
183181
# minimize window so more panes can fit
184182
tmux resize-pane -t "${session_name}:${window_number}" -U "999"
185183
}
@@ -197,21 +195,21 @@ restore_pane() {
197195
# overwrite the pane
198196
# happens only for the first pane if it's the only registered pane for the whole tmux server
199197
local pane_id="$(tmux display-message -p -F "#{pane_id}" -t "$session_name:$window_number")"
200-
new_pane "$session_name" "$window_number" "$dir" "$pane_index" "$pane_title"
198+
new_pane "$session_name" "$window_number" "$dir" "$pane_index"
201199
tmux kill-pane -t "$pane_id"
202200
else
203201
# Pane exists, no need to create it!
204202
# Pane existence is registered. Later, its process also won't be restored.
205203
register_existing_pane "$session_name" "$window_number" "$pane_index"
206-
set_pane_title "$session_name" "$window_number" "$pane_index" "$pane_title"
207204
fi
208205
elif window_exists "$session_name" "$window_number"; then
209-
new_pane "$session_name" "$window_number" "$dir" "$pane_index" "$pane_title"
206+
new_pane "$session_name" "$window_number" "$dir" "$pane_index"
210207
elif session_exists "$session_name"; then
211208
new_window "$session_name" "$window_number" "$dir" "$pane_index"
212209
else
213210
new_session "$session_name" "$window_number" "$dir" "$pane_index"
214211
fi
212+
set_pane_title "$session_name" "$window_number" "$pane_index" "$pane_title"
215213
done < <(echo "$pane")
216214
}
217215

0 commit comments

Comments
 (0)