From 2ab995557723d87c2e616973179cc712896bcf6a Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 6 Apr 2009 17:15:31 +0000
Subject: Fixed a crash in LSL5 when opening the inventory

svn-id: r39877
---
 engines/sci/gfx/res_view1.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/sci')

diff --git a/engines/sci/gfx/res_view1.cpp b/engines/sci/gfx/res_view1.cpp
index 68f5ad4cff..3bf10cb7de 100644
--- a/engines/sci/gfx/res_view1.cpp
+++ b/engines/sci/gfx/res_view1.cpp
@@ -206,7 +206,8 @@ gfx_pixmap_t *gfxr_draw_cel1(int id, int loop, int cel, int mirrored, byte *reso
 	retval->color_key = cel_base[isSci11 ? 8 : 6];
 	retval->xoffset = (mirrored) ? xdisplace : -xdisplace;
 	retval->yoffset = -ydisplace;
-	retval->palette = view ? view->palette->getref() : NULL;
+	// FIXME: In LSL5, it seems that the inventory has views without palettes (or we don't load palettes properly)
+	retval->palette = (view && view->palette) ? view->palette->getref() : NULL;
 
 	if (xl <= 0 || yl <= 0) {
 		gfx_free_pixmap(retval);
-- 
cgit v1.2.3