Mercurial > hg > forks > geeqie

changeset 2013:512ff8b8f325

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
initialize default options before commandline parsing this fixes a crash on images specified on commandline
author Vladimir Nadvornik <nadvornik@suse.cz>
date Thu, 26 Jul 2012 16:02:52 +0200
parents 0dfa3505f781
children b3bc1aa2d666
files src/main.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c	Thu May 17 18:28:56 2012 +0100
+++ b/src/main.c	Thu Jul 26 16:02:52 2012 +0200
@@ -801,6 +801,10 @@
 	DEBUG_1("%s main: pixbuf_inline_register_stock_icons", get_exec_time());	 
 	pixbuf_inline_register_stock_icons();
 
+	DEBUG_1("%s main: setting default options before commandline handling", get_exec_time());	 
+	options = init_options(NULL);
+	setup_default_options(options);
+
 	DEBUG_1("%s main: parse_command_line", get_exec_time());	 
 	parse_command_line(argc, argv);
 
@@ -818,8 +822,6 @@
 
 	/* restore session from the config file */
 
-	options = init_options(NULL);
-	setup_default_options(options);
 
 	DEBUG_1("%s main: load_options", get_exec_time());	 
 	if (!load_options(options))