about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarco Peereboom <marco@conformal.com>2012-05-31 14:10:07 -0500
committerMarco Peereboom <marco@conformal.com>2012-05-31 14:10:07 -0500
commit6a8a64466ca291a6e2e99b071ab99cc8f955ed49 (patch)
treece1fd8d8ec82411fae93af012e2c1888ae88eee3
parent0e4a0ec119ab35e7ec9b6d6dbaae1cad30d2fb3e (diff)
downloadxombrero-6a8a64466ca291a6e2e99b071ab99cc8f955ed49.tar.gz
move os_init to right before read config
-rw-r--r--xombrero.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xombrero.c b/xombrero.c
index 3a320b3..7f64aa5 100644
--- a/xombrero.c
+++ b/xombrero.c
@@ -7692,9 +7692,6 @@ main(int argc, char **argv)
 
 	start_argv = (char * const *)argv;
 
-	if (os_init)
-		os_init();
-
 	/* prepare gtk */
 #ifdef USE_THREADS
 #if !defined __MINGW32__
@@ -7834,6 +7831,10 @@ main(int argc, char **argv)
 	spell_check_languages = g_strdup("en_US");
 	encoding = g_strdup("UTF-8");
 
+	/* override os specific settings */
+	if (os_init)
+		os_init();
+
 	/* read config file */
 	if (strlen(conf) == 0)
 		snprintf(conf, sizeof conf, "%s" PS ".%s",