--- BasiliskII/src/prefs.cpp	1999/10/28 15:33:10	1.3
+++ BasiliskII/src/prefs.cpp	2000/05/16 17:11:37	1.6
@@ -1,7 +1,7 @@
 /*
  *  prefs.cpp - Preferences handling
  *
- *  Basilisk II (C) 1997-1999 Christian Bauer
+ *  Basilisk II (C) 1997-2000 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
@@ -58,6 +58,7 @@ prefs_desc common_prefs_items[] = {
 	{"fpu", TYPE_BOOLEAN, false},		// Enable FPU emulation (main.cpp)
 	{"nocdrom", TYPE_BOOLEAN, false},	// Don't install CD-ROM driver (cdrom.cpp/rom_patches.cpp)
 	{"nosound", TYPE_BOOLEAN, false},	// Don't enable sound output (audio_*.cpp)
+	{"noclipconversion", TYPE_BOOLEAN, false}, // Don't convert clipboard contents (clip_*.cpp)
 	{"nogui", TYPE_BOOLEAN, false},		// Disable GUI (main_*.cpp)
 	{NULL, TYPE_END, false}	// End of list
 };
@@ -95,6 +96,7 @@ void PrefsInit(void)
 	PrefsAddBool("fpu", false);
 	PrefsAddBool("nocdrom", false);
 	PrefsAddBool("nosound", false);
+	PrefsAddBool("noclipconversion", false);
 	PrefsAddBool("nogui", false);
 	AddPlatformPrefsDefaults();
 
@@ -333,8 +335,6 @@ void LoadPrefsFromStream(FILE *f)
 
 		// Skip whitespace until value
 		while (isspace(*p)) p++;
-		if (*p == 0)
-			continue;
 		char *keyword = line;
 		char *value = p;
 		int32 i = atol(value);