diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
| commit | 4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432 (patch) | |
| tree | 2b7be1c59b057b4c3dbc763291c5ad63ec7f3828 /frontends/amiga/icon.c | |
| parent | 2c6f2f4ef5a50c36676308f6663c0d21edc6aa70 (diff) | |
| parent | faf4c1fb6012941134046db14370f60748184b05 (diff) | |
| download | netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.gz netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/malloc
Conflicts:
frontends/amiga/icon.c
Diffstat (limited to 'frontends/amiga/icon.c')
| -rw-r--r-- | frontends/amiga/icon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c index c9fc6fd8b..3f597a1ba 100644 --- a/frontends/amiga/icon.c +++ b/frontends/amiga/icon.c @@ -542,6 +542,6 @@ void amiga_icon_free(struct DiskObject *dobj) struct bitmap *bm = dobj->do_Gadget.UserData; FreeDiskObject(dobj); - if(bm) free(ami_bitmap_get_icondata(bm)); + if(bm) ami_bitmap_free_icondata(bm); } |