From c7f89a129d27ba0a463bfe894a7d365eae12c917 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Tue, 11 Aug 2009 19:00:00 +0000
Subject: [PATCH] Handle workspace changes gracefully, without crashing.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32261 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/game/WindowScreen.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/kits/game/WindowScreen.cpp b/src/kits/game/WindowScreen.cpp
index 2d9ab90c29..6a5f45c06d 100644
--- a/src/kits/game/WindowScreen.cpp
+++ b/src/kits/game/WindowScreen.cpp
@@ -337,18 +337,21 @@ BWindowScreen::SetColorList(rgb_color *list, int32 firstIndex, int32 lastIndex)
 		for (int32 x = firstIndex; x <= lastIndex; x++) {
 			fPalette[x] = list[x - firstIndex];
 				// update our local palette as well
-
-			colors[j++] = fPalette[x].red;
-			colors[j++] = fPalette[x].green;
-			colors[j++] = fPalette[x].blue;
 		}
 
+		j = 0;
+		for (int32 i = 0; i < 256; i++) {
+			colors[j++] = fPalette[i].red;
+			colors[j++] = fPalette[i].green;
+			colors[j++] = fPalette[i].blue;
+		}
+		
 		if (fAddonImage >= 0) {
 			set_indexed_colors setIndexedColors =
 				(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
 					NULL);
 			if (setIndexedColors != NULL) {
-				setIndexedColors(lastIndex - firstIndex + 1, firstIndex,
+				setIndexedColors(255, 0,
 					colors, 0);
 			}
 		}
@@ -719,14 +722,15 @@ status_t
 BWindowScreen::_Deactivate()
 {
 	CALLED();
-	_AssertDisplayMode(fOriginalDisplayMode);
-
+	
 	if (fDebugState && !fDebugFirst) {
 		_Suspend();
 		SuspensionHook(false);
 	} else
 		ScreenConnected(false);
 
+	_AssertDisplayMode(fOriginalDisplayMode);
+
 	_ResetAccelerantHooks();
 	
 	be_app->ShowCursor();
@@ -747,12 +751,8 @@ BWindowScreen::_SetupAccelerantHooks()
 	status_t status = B_OK;
 	if (fAddonImage < 0)
 		status = _InitClone();
-	else {
-		if (fWaitEngineIdle)
-			fWaitEngineIdle();
-		
+	else	
 		_ResetAccelerantHooks();
-	}
 			
 	if (status == B_OK) {
 		sWaitIdleHook = fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
@@ -777,7 +777,9 @@ void
 BWindowScreen::_ResetAccelerantHooks()
 {
 	CALLED();
-	
+	if (fWaitEngineIdle)
+		fWaitEngineIdle();
+			
 	sFillRectHook = NULL;
 	sBlitRectHook = NULL;
 	sTransparentBlitHook = NULL;