From 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue, 25 Mar 2008 23:01:02 -0700
Subject: [PATCH] XQuartz: Sanity-check the removal of the 256-color option
 Fixes the 'one-time-preferences' bug in 2.2.0_rc1

---
 hw/xquartz/X11Controller.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index a9d2addbd..dfa2074fd 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -649,7 +649,8 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
 
     [depth selectItemAtIndex:[depth indexOfItemWithTag:[NSApp prefs_get_integer:@PREFS_DEPTH default:-1]]];
     // TODO: Add 256 color support
-    [depth removeItemAtIndex:[depth indexOfItemWithTag:8]];
+    if([depth indexOfItemWithTag:8] != -1)
+        [depth removeItemAtIndex:[depth indexOfItemWithTag:8]];
 	
     [enable_fullscreen setIntValue:!quartzEnableRootless];
     // TODO: Add fullscreen support