--- BasiliskII/src/Windows/prefs_windows.cpp	2005/11/20 17:26:16	1.9
+++ BasiliskII/src/Windows/prefs_windows.cpp	2009/07/23 19:19:13	1.13
@@ -1,7 +1,7 @@
 /*
  *  prefs_windows.cpp - Preferences handling, Windows specific stuff
  *
- *  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
@@ -41,10 +41,12 @@ prefs_desc platform_prefs_items[] = {
 #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
 	{"ignoresegv", TYPE_BOOLEAN, false,    "ignore illegal memory accesses"},
 #endif
+	{"idlewait", TYPE_BOOLEAN, false,      "sleep when idle"},
 	{"enableextfs", TYPE_BOOLEAN, false,   "enable extfs system"},
 	{"debugextfs", TYPE_BOOLEAN, false,    "debug extfs system"},
 	{"extdrives", TYPE_STRING, false,      "define allowed extfs drives"},
 	{"pollmedia", TYPE_BOOLEAN, false,     "poll for new media (e.g. cd, floppy)"},
+	{"etherguid", TYPE_STRING, false,      "GUID of the ethernet device to use"},
 	{"etherpermanentaddress", TYPE_BOOLEAN, false,  "use permanent NIC address to identify itself"},
 	{"ethermulticastmode", TYPE_INT32, false,       "how to multicast packets"},
 	{"etherfakeaddress", TYPE_STRING, false,        "optional fake hardware address"},
@@ -68,7 +70,7 @@ static string prefs_path;
  *  Load preferences from settings file
  */
 
-void LoadPrefs(void)
+void LoadPrefs(const char *vmdir)
 {
 	// Construct prefs path
 	if (UserPrefsPath.empty()) {
@@ -128,9 +130,9 @@ void AddPlatformPrefsDefaults(void)
 #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
 	PrefsAddBool("ignoresegv", false);
 #endif
+	PrefsAddBool("idlewait", true);
 	PrefsReplaceBool("etherpermanentaddress", true);
 	PrefsReplaceInt32("ethermulticastmode", 0);
-	PrefsReplaceBool("routerenabled", false);
 	PrefsReplaceString("ftp_port_list", "21");
 	PrefsReplaceString("seriala", "COM1");
 	PrefsReplaceString("serialb", "COM2");