--- BasiliskII/src/MacOSX/sys_darwin.cpp	2008/07/20 07:38:27	1.15
+++ BasiliskII/src/MacOSX/sys_darwin.cpp	2012/04/21 16:04:51	1.17
@@ -1,5 +1,5 @@
 /*
- *	$Id: sys_darwin.cpp,v 1.15 2008/07/20 07:38:27 asvitkine Exp $
+ *	$Id: sys_darwin.cpp,v 1.17 2012/04/21 16:04:51 asvitkine Exp $
  *
  *	sys_darwin.cpp - Extra Darwin system dependant routines. Called by:
  *
@@ -66,8 +66,10 @@ extern void SysMediaRemoved(const char *
 
 void DarwinSysInit(void)
 {
-	media_thread_active = (pthread_create(&media_thread, NULL, media_poll_func, NULL) == 0);
-	D(bug("Media poll thread installed (%ld)\n", media_thread));
+	if (PrefsFindBool("nocdrom")) {
+		media_thread_active = (pthread_create(&media_thread, NULL, media_poll_func, NULL) == 0);
+		D(bug("Media poll thread installed (%ld)\n", media_thread));
+	}
 }