diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5da3f6d1c..78798f518 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D2X-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, fixing arithmetic crash with SDL Video build 20100322 -------- diff --git a/main/titles.c b/main/titles.c index f106263bd..a87293abf 100644 --- a/main/titles.c +++ b/main/titles.c @@ -1372,7 +1372,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);