From: Colin Clark <colin.clark@cclark.uk>
Date: Mon, 17 Aug 2020 14:33:33 +0000 (+0100)
Subject: Part fix #796: Restored windows all show the same location
X-Git-Tag: v1.6~25
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=0b0e48bc49ef3fe725cceaa58d725ce9cc6da60f

Part fix #796: Restored windows all show the same location

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

If multiple windows are defined in the config. file, command line
options are used only in the main window.
---

diff --git a/src/layout.c b/src/layout.c
index 91419f46..2b535dc2 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -2900,7 +2900,10 @@ LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar
 
 	if (attribute_names) layout_load_attributes(&lop, attribute_names, attribute_values);
 
-	if (use_commandline)
+	/* If multiple windows are specified in the config. file,
+	 * use the command line options only in the main window.
+	 */
+	if (use_commandline && (g_strcmp0(lop.id, "main") == 0))
 		{
 		layout_config_commandline(&lop, &path);
 		}