diff options
| author | lukefromdc <[email protected]> | 2019-04-02 16:43:16 -0400 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2019-04-09 14:48:34 +0200 |
| commit | 79be18ef14cdf3404b96af1e8355648b5c0b3beb (patch) | |
| tree | 8654e80ed52b4c35fbab066898dc6dfb7b193419 | |
| parent | 03879a95d4e7af812be6e0d7017855da67cf2ab3 (diff) | |
| download | caja-79be18ef14cdf3404b96af1e8355648b5c0b3beb.tar.bz2 caja-79be18ef14cdf3404b96af1e8355648b5c0b3beb.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.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/caja-application.c b/src/caja-application.c index ce9c57e1..11578673 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 |