summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-02-01 10:58:40 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-02-01 10:58:40 +0000
commitbfb9e1401eead363c511fbbbe634f73dbeef0da8 (patch)
treed934f964f843d4e2c9f17c2a44e773ec08737921 /amiga
parent2ad93ed773057a7fe9ddc93deba7c7e485b095dc (diff)
downloadnetsurf-bfb9e1401eead363c511fbbbe634f73dbeef0da8.tar.gz
netsurf-bfb9e1401eead363c511fbbbe634f73dbeef0da8.tar.bz2
Handle the bltmask being NULL
Diffstat (limited to 'amiga')
-rw-r--r--amiga/gui.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 884f263b3..366526800 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1711,9 +1711,13 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
tag, tag_data,
TAG_DONE);
#else
- /*\todo we are assuming we are always masking here, which might not be true */
- BltMaskBitMapRastPort(bm, 0, 0, g->shared->win->RPort,
- bbox->Left, bbox->Top, 16, 16, minterm, tag_data);
+ if(tag_data) {
+ BltMaskBitMapRastPort(bm, 0, 0, g->shared->win->RPort,
+ bbox->Left, bbox->Top, 16, 16, minterm, tag_data);
+ } else {
+ BltBitMapRastPort(bm, 0, 0, g->shared->win->RPort,
+ bbox->Left, bbox->Top, 16, 16, 0xc0);
+ }
#endif
ami_gui_free_space_box(bbox);
}