===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/format.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- src/usr.bin/tmux/format.c	2015/04/21 15:18:38	1.62
+++ src/usr.bin/tmux/format.c	2015/04/21 22:38:49	1.63
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.62 2015/04/21 15:18:38 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.63 2015/04/21 22:38:49 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -577,7 +577,10 @@
 
 	ft->w = w;
 
-	layout = layout_dump(w);
+	if (w->saved_layout_root != NULL)
+		layout = layout_dump(w->saved_layout_root);
+	else
+		layout = layout_dump(w->layout_root);
 
 	format_add(ft, "window_id", "@%u", w->id);
 	format_add(ft, "window_name", "%s", w->name);