--- BasiliskII/src/prefs.cpp	2005/01/30 21:42:13	1.15
+++ BasiliskII/src/prefs.cpp	2009/07/23 19:19:14	1.18
@@ -1,7 +1,7 @@
 /*
  *  prefs.cpp - Preferences handling
  *
- *  Basilisk II (C) 1997-2005 Christian Bauer
+ *  Basilisk II (C) 1997-2008 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,21 +47,21 @@ static const prefs_desc *find_prefs_desc
  *  Initialize preferences
  */
 
-void PrefsInit(int &argc, char **&argv)
+void PrefsInit(const char *vmdir, int &argc, char **&argv)
 {
 	// Set defaults
 	AddPrefsDefaults();
 	AddPlatformPrefsDefaults();
 
 	// Load preferences from settings file
-	LoadPrefs();
+	LoadPrefs(vmdir);
 
 	// Override prefs with command line options
 	for (int i=1; i<argc; i++) {
 
 		// Options are of the form '--keyword'
 		const char *option = argv[i];
-		if (strlen(option) < 3 || option[0] != '-' || option[1] != '-')
+		if (!option || strlen(option) < 3 || option[0] != '-' || option[1] != '-')
 			continue;
 		const char *keyword = option + 2;
 
@@ -121,6 +121,11 @@ void PrefsInit(int &argc, char **&argv)
 			argc -= k;
 		}
 	}
+
+#ifdef SHEEPSHAVER
+	// System specific initialization
+	prefs_init();
+#endif
 }
 
 
@@ -130,6 +135,11 @@ void PrefsInit(int &argc, char **&argv)
 
 void PrefsExit(void)
 {
+#ifdef SHEEPSHAVER
+	// System specific deinitialization
+	prefs_exit();
+#endif
+
 	// Free prefs list
 	prefs_node *p = the_prefs, *next;
 	while (p) {