From 89d0b3cdadf23ce78fe59c886fc82c109bb56db6 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Sat, 25 Jun 2005 13:58:55 +0000
Subject: [PATCH] Safer code

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13275 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/ServerApp.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/servers/app/ServerApp.cpp b/src/servers/app/ServerApp.cpp
index 65430f7f8a..3588fa477c 100644
--- a/src/servers/app/ServerApp.cpp
+++ b/src/servers/app/ServerApp.cpp
@@ -1935,9 +1935,14 @@ status_t ret = B_ERROR;
 
 			screen_id id;
 			link.Read<screen_id>(&id);
-
-			fLink.StartMessage(SERVER_TRUE);
-			fLink.Attach<color_map>(*SystemColorMap());
+			
+			const color_map *colorMap = SystemColorMap();
+			if (colorMap != NULL) {
+				fLink.StartMessage(SERVER_TRUE);
+				fLink.Attach<color_map>(*colorMap);
+			} else 
+				fLink.StartMessage(SERVER_FALSE);
+			
 			fLink.Flush();
 			break;
 		}