summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2019-04-02 16:43:16 -0400
committerraveit65 <[email protected]>2022-07-19 23:17:53 +0200
commitbc55be6a7cace886cdf5c47f269f087d1532e72f (patch)
treee8dc3c0466049e29eabf684f2eb447fb85855f89
parenta994d545695bd8935271dbbe69beb999bd6774ae (diff)
downloadcaja-bc55be6a7cace886cdf5c47f269f087d1532e72f.tar.bz2
caja-bc55be6a7cace886cdf5c47f269f087d1532e72f.tar.xz
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.
-rw-r--r--src/caja-application.c21
1 files 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