From 3c338e59edf156f50b60dbef4ed9eb0cfcd1df27 Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Sun, 12 Feb 2012 08:55:58 +0100
Subject: [PATCH] core: fix bug with layout: assign layout number in buffers
 when doing /layout save

---
 src/gui/gui-layout.c | 53 +++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/gui/gui-layout.c b/src/gui/gui-layout.c
index 135aea705..f50228d5b 100644
--- a/src/gui/gui-layout.c
+++ b/src/gui/gui-layout.c
@@ -149,31 +149,6 @@ gui_layout_buffer_add (struct t_gui_layout_buffer **layout_buffers,
     return new_layout_buffer;
 }
 
-/*
- * gui_layout_buffer_save: save current layout for buffers
- */
-
-void
-gui_layout_buffer_save (struct t_gui_layout_buffer **layout_buffers,
-                        struct t_gui_layout_buffer **last_layout_buffer)
-{
-    struct t_gui_buffer *ptr_buffer;
-
-    if (!layout_buffers || !last_layout_buffer)
-        return;
-
-    gui_layout_buffer_remove_all (layout_buffers, last_layout_buffer);
-
-    for (ptr_buffer = gui_buffers; ptr_buffer;
-         ptr_buffer = ptr_buffer->next_buffer)
-    {
-        gui_layout_buffer_add (layout_buffers, last_layout_buffer,
-                               gui_buffer_get_plugin_name (ptr_buffer),
-                               ptr_buffer->name,
-                               ptr_buffer->number);
-    }
-}
-
 /*
  * gui_layout_buffer_get_number: get layout number for a plugin/buffer
  */
@@ -237,6 +212,34 @@ gui_layout_buffer_get_number_all (struct t_gui_layout_buffer *layout_buffers)
     }
 }
 
+/*
+ * gui_layout_buffer_save: save current layout for buffers
+ */
+
+void
+gui_layout_buffer_save (struct t_gui_layout_buffer **layout_buffers,
+                        struct t_gui_layout_buffer **last_layout_buffer)
+{
+    struct t_gui_buffer *ptr_buffer;
+
+    if (!layout_buffers || !last_layout_buffer)
+        return;
+
+    gui_layout_buffer_remove_all (layout_buffers, last_layout_buffer);
+
+    for (ptr_buffer = gui_buffers; ptr_buffer;
+         ptr_buffer = ptr_buffer->next_buffer)
+    {
+        gui_layout_buffer_add (layout_buffers, last_layout_buffer,
+                               gui_buffer_get_plugin_name (ptr_buffer),
+                               ptr_buffer->name,
+                               ptr_buffer->number);
+    }
+
+    /* get layout number for all buffers */
+    gui_layout_buffer_get_number_all (*layout_buffers);
+}
+
 /*
  * gui_layout_buffer_apply: apply a layout for buffers
  */