From 040d558d39072c42cbc763e07fa7ac0d8a0b3c80 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Mon, 5 Aug 2019 22:16:00 +0100 Subject: amiga: Try and catch the last content rework for amiga Signed-off-by: Daniel Silverstone --- frontends/amiga/dt_anim.c | 3 ++- frontends/amiga/dt_picture.c | 3 ++- frontends/amiga/icon.c | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'frontends/amiga') diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c index 8d7e8955c..70f7e6ba6 100644 --- a/frontends/amiga/dt_anim.c +++ b/frontends/amiga/dt_anim.c @@ -189,7 +189,8 @@ bool amiga_dt_anim_convert(struct content *c) plugin->bitmap = amiga_bitmap_create(width, height, bm_flags); if (!plugin->bitmap) { - msg_data.error = messages_get("NoMemory"); + msg_data.errordata.errorcode = NSERROR_NOMEM; + msg_data.errordata.errormsg = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c index 660b2379e..e52656191 100644 --- a/frontends/amiga/dt_picture.c +++ b/frontends/amiga/dt_picture.c @@ -186,7 +186,8 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) { bitmap = amiga_bitmap_create(c->width, c->height, BITMAP_NEW); if (!bitmap) { - msg_data.error = messages_get("NoMemory"); + msg_data.errordata.errorcode = NSERROR_NOMEM; + msg_data.errordata.errorcode = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return NULL; } diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c index 582d355b6..6e825795e 100644 --- a/frontends/amiga/icon.c +++ b/frontends/amiga/icon.c @@ -166,7 +166,8 @@ bool amiga_icon_convert(struct content *c) if(dobj == NULL) { - msg_data.error = messages_get("NoMemory"); + msg_data.errordata.errorcode = NSERROR_NOMEM; + msg_data.errordata.errormsg = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); return false; } @@ -186,14 +187,16 @@ bool amiga_icon_convert(struct content *c) icon_c->bitmap = amiga_bitmap_create(width, height, BITMAP_NEW); if (!icon_c->bitmap) { - msg_data.error = messages_get("NoMemory"); + msg_data.errordata.errorcode = NSERROR_NOMEM; + msg_data.errordata.errormsg = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); if(dobj) FreeDiskObject(dobj); return false; } imagebuf = (ULONG *) amiga_bitmap_get_buffer(icon_c->bitmap); if (!imagebuf) { - msg_data.error = messages_get("NoMemory"); + msg_data.errordata.errorcode = NSERROR_NOMEM; + msg_data.errordata.errormsg = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, &msg_data); if(dobj) FreeDiskObject(dobj); return false; -- cgit v1.2.3