From 962a01cc5d6f122906b20d63f85174f83c324ba6 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Wed, 24 Mar 2010 13:59:42 +0000
Subject: [PATCH] Only show briefing background if we have one, fixing
 arithmetic crash with SDL Video build

---
 CHANGELOG.txt | 1 +
 main/titles.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 84910fe4b..7bb00ed79 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20100324
 --------
 arch/include/event.h, arch/include/mouse.h, arch/sdl/mouse.c, main/kconfig.c, main/movie.c, main/newmenu.c, main/titles.c: Add EVENT_MOUSE_BUTTON_DOWN and EVENT_MOUSE_BUTTON_UP, use for all windows except game and editor. Fixes crash on iMac G5 when pressing keys to progress through briefing
+main/titles.c: Only show briefing background if we have one (which we should always for Descent 1)
 
 20100322
 --------
diff --git a/main/titles.c b/main/titles.c
index 42f2e3b48..9d623bbee 100644
--- a/main/titles.c
+++ b/main/titles.c
@@ -1170,7 +1170,8 @@ int briefing_handler(window *wind, d_event *event, briefing *br)
 			break;
 
 		case EVENT_WINDOW_DRAW:
-			show_fullscr(&br->background);
+			if (br->background.bm_data)
+				show_fullscr(&br->background);
 
 			if (br->guy_bitmap_show)
 				show_briefing_bitmap(&br->guy_bitmap);