From: Vladimir Nadvornik <nadvornik@suse.cz>
Date: Thu, 26 Jul 2012 14:02:52 +0000 (+0200)
Subject: initialize default options before commandline parsing
X-Git-Tag: 1.1~19
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=d17c428da1a3a25b1a24f50470f14e98e8cbd226

initialize default options before commandline parsing

this fixes a crash on images specified on commandline
---

diff --git a/src/main.c b/src/main.c
index 1ddee03c..8ff84d14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -801,6 +801,10 @@ gint main(gint argc, gchar *argv[])
 	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 @@ gint main(gint argc, gchar *argv[])
 
 	/* 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))