From 5993b55a0a5583d48a862fa0bf785e7d95f0d512 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Tue, 2 Apr 2019 16:43:16 -0400 Subject: Fix invocation with --geometry from the command line Due to changes somewhere else windows called with --geometry must now be opened before splitedOptions is freed or the geometry passed to later functions gets corrrupted Note that setting a width smaller than 654 px will generate GTK warnings (negative content width and similar) but will still mostly work. --- src/caja-application.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/caja-application.c b/src/caja-application.c index e158beab..666bb9ed 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -374,18 +374,25 @@ caja_application_open (GApplication *app, } sscanf (splitedOptions[2], "%d", &open_in_tabs); + open_windows (self, files, + gdk_screen_get_default (), + geometry, + n_files, + browser_window, + open_in_tabs); + /* Reset this or 3ed and later invocations will use same * geometry even if the user has resized open window */ self->priv->geometry = NULL; g_strfreev (splitedOptions); } - - open_windows (self, files, - gdk_screen_get_default (), - geometry, - n_files, - browser_window, - open_in_tabs); + else + open_windows (self, files, + gdk_screen_get_default (), + geometry, + n_files, + browser_window, + open_in_tabs); } void -- cgit v1.2.1