From dfc8f5aef4e49a8d23f906b4b36f6c37f07a2dc9 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 27 Sep 2018 00:18:14 +0100 Subject: Quick fix to convert helphints to correct charset We should probably have our own strings for these --- frontends/amiga/gui.c | 2 +- frontends/amiga/misc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index e337ede0c..e08ef5962 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -4688,7 +4688,7 @@ static void gui_window_destroy(struct gui_window *g) free(g->shared->svbuffer); for(gid = 0; gid < GID_LAST; gid++) - free(g->shared->helphints[gid]); + ami_utf8_free(g->shared->helphints[gid]); ami_gui_win_list_remove(g->shared); if(g->tab_node) { diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c index 532d2f182..822d640d0 100755 --- a/frontends/amiga/misc.c +++ b/frontends/amiga/misc.c @@ -237,7 +237,8 @@ static nserror amiga_path_to_nsurl(const char *path, struct nsurl **url_out) } /** - * returns a string with escape chars translated. + * returns a string with escape chars translated + * and string converted to local charset * (based on remove_underscores from utils.c) */ @@ -259,7 +260,8 @@ char *translate_escape_chars(const char *s) } } ret[ii] = '\0'; - return ret; + + return ami_utf8_easy(ret); } /** -- cgit v1.2.3