diff options
| author | lukefromdc <[email protected]> | 2019-04-02 16:43:16 -0400 |
|---|---|---|
| committer | ZenWalker <[email protected]> | 2019-04-09 14:45:11 +0200 |
| commit | 5993b55a0a5583d48a862fa0bf785e7d95f0d512 (patch) | |
| tree | e872a42764fc0b1b6fcd14cb3b7b14d2be0a202f | |
| parent | e5e010e6a0c1d81041ff45931551a28ba83637b7 (diff) | |
| download | caja-5993b55a0a5583d48a862fa0bf785e7d95f0d512.tar.bz2 caja-5993b55a0a5583d48a862fa0bf785e7d95f0d512.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 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 |