--- wlapplication.cc.org	2010-08-10 13:01:11.751113650 +0200
+++ wlapplication.cc	2010-08-10 14:11:16.826113704 +0200
@@ -270,11 +270,17 @@
 	UI::g_fh = new UI::Font_Handler();
 
 	parse_commandline(argc, argv); //throws Parameter_error, handled by main.cc
-	if (m_default_datadirs) {
-		setup_searchpaths(m_commandline["EXENAME"]);
+
+	if (m_commandline.count("homedir")) {
+		log ("Adding home directory: %s\n", m_commandline["homedir"].c_str());
+		m_homedir = m_commandline["homedir"];
+		m_commandline.erase("homedir");
 	}
 	setup_homedir();
 	init_settings();
+	if (m_default_datadirs) {
+		setup_searchpaths(m_commandline["EXENAME"]);
+	}
 	cleanup_replays();
 	init_hardware();
 
@@ -1091,11 +1097,6 @@
 		m_default_datadirs = false;
 		m_commandline.erase("datadir");
 	}
-	if (m_commandline.count("homedir")) {
-		log ("Adding home directory: %s\n", m_commandline["homedir"].c_str());
-		m_homedir = m_commandline["homedir"];
-		m_commandline.erase("homedir");
-	}
 
 	if (m_commandline.count("double")) {
 #ifdef DEBUG