From c78a38803ad53e17a704648de7e3f785854f5bb0 Mon Sep 17 00:00:00 2001
From: Bruno Sutic <bruno.sutic@gmail.com>
Date: Tue, 26 Aug 2014 17:28:40 +0200
Subject: [PATCH] Bugfix: non-existing window names

Fixes #11
---
 CHANGELOG.md                | 1 +
 scripts/session_restorer.sh | 2 +-
 scripts/session_saver.sh    | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2a1a5c..f329627 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### master
 - save and restore current and alternate session
+- fix a bug with non-existing window names
 
 ### v0.0.2, 2014-08-26
 - saving a new session does not remove the previous one
diff --git a/scripts/session_restorer.sh b/scripts/session_restorer.sh
index bda9db0..c2dde33 100755
--- a/scripts/session_restorer.sh
+++ b/scripts/session_restorer.sh
@@ -71,7 +71,7 @@ new_pane() {
 restore_pane() {
 	local pane="$1"
 	echo "$pane" |
-	while IFS=$'\t' read line_type session_name window_number window_name dir; do
+	while IFS=$'\t' read line_type session_name window_number dir window_name; do
 		if window_exists "$session_name" "$window_number"; then
 			new_pane "$session_name" "$window_number" "$window_name" "$dir"
 		elif session_exists "$session_name"; then
diff --git a/scripts/session_saver.sh b/scripts/session_saver.sh
index 37563fe..9c93733 100755
--- a/scripts/session_saver.sh
+++ b/scripts/session_saver.sh
@@ -13,9 +13,9 @@ pane_format() {
 	format+="${delimiter}"
 	format+="#{window_index}"
 	format+="${delimiter}"
-	format+="#{window_name}"
-	format+="${delimiter}"
 	format+="#{pane_current_path}"
+	format+="${delimiter}"
+	format+="#{window_name}"
 	echo "$format"
 }