From 641b5c2d3bdd5a9c13bcf717ba983c54b79fd588 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Wed, 27 Mar 2024 15:27:35 +0000
Subject: [PATCH] Fix #1240: Regression: Option to open new full-function
 window directly is missing

https://github.com/BestImageViewer/geeqie/issues/1240

Ensure that the sort sidebar is displayed if set in a saved window.
---
 src/rcfile.cc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/rcfile.cc b/src/rcfile.cc
index 7b00c8a2..73e3d587 100644
--- a/src/rcfile.cc
+++ b/src/rcfile.cc
@@ -1630,7 +1630,16 @@ static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext
 		}
 	else if (g_ascii_strcasecmp(element_name, "bar_sort") == 0)
 		{
-		bar_sort_cold_start(lw, attribute_names, attribute_values);
+		if (g_list_length(layout_window_list) == 1)
+			{
+			bar_sort_cold_start(lw, attribute_names, attribute_values);
+			}
+		else
+			{
+			GtkWidget *bar = bar_sort_new_from_config(lw, attribute_names, attribute_values);
+			layout_bar_sort_set(lw, bar);
+			gtk_widget_show(lw->bar_sort);
+			}
 		options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
 		}
 	else if (g_ascii_strcasecmp(element_name, "toolbar") == 0)
-- 
2.20.1