Merge branch 'osx-video-fix'

2013-05-14 06:37:47 -04:00 · 2013-05-14 06:37:47 -04:00 · 0e667be7be
parent 15e47a1f07 241162f261
commit 0e667be7be
1 changed files with 5 additions and 0 deletions
--- a/BasiliskII/src/Unix/video_x.cpp
+++ b/BasiliskII/src/Unix/video_x.cpp
@ -1636,6 +1636,11 @@ bool VideoInit(bool classic)
 		ErrorAlert(STR_UNSUPP_DEPTH_ERR);
 		return false;
 	}
+
+	// 15-bit color does not seem to work on OS X
+	int *list_end = std::remove(avail_depths, avail_depths + num_depths, 
+				    15);
+	num_depths = list_end - avail_depths;
 	std::sort(avail_depths, avail_depths + num_depths);
 	
 #ifdef ENABLE_FBDEV_DGA