core: save and restore layout for buffers and windows on /upgrade

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c
index a4f5ded65..a23784906 100644
--- a/src/gui/gui-line.c
+++ b/src/gui/gui-line.c
@@ -847,8 +847,7 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date,
     
     /* check if line is filtered or not */
     snprintf (buffer_full_name, sizeof (buffer_full_name), "%s.%s",
-              (!buffer->plugin && buffer->plugin_name_for_upgrade) ?
-              buffer->plugin_name_for_upgrade : plugin_get_name (buffer->plugin),
+              gui_buffer_get_plugin_name (buffer),
               buffer->name);
     new_line->data->displayed = gui_filter_check_line (new_line,
                                                        buffer_full_name);
@@ -1009,8 +1008,7 @@ gui_line_add_y (struct t_gui_buffer *buffer, int y, const char *message)
     
     /* check if line is filtered or not */
     snprintf (buffer_full_name, sizeof (buffer_full_name), "%s.%s",
-              (!buffer->plugin && buffer->plugin_name_for_upgrade) ?
-              buffer->plugin_name_for_upgrade : plugin_get_name (buffer->plugin),
+              gui_buffer_get_plugin_name (buffer),
               buffer->name);
     ptr_line->data->displayed = gui_filter_check_line (ptr_line,
                                                        buffer_full_name);