diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
commit | 9f10babe645fe67b02fae90f852d5e4cdfcbb70e (patch) | |
tree | 909b77e3c48418204a23ac4723684ca0bc76a081 /frontends/amiga | |
parent | 0d9023148d2a34bd908aac38e44d449359b03438 (diff) | |
parent | 7dab7cb43d4091648ceb40684ff70aff7091c648 (diff) | |
download | netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.gz netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/menuclass
Diffstat (limited to 'frontends/amiga')
-rw-r--r-- | frontends/amiga/corewindow.c | 2 | ||||
-rw-r--r-- | frontends/amiga/menu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c index d2bfbf982..0ed16d1ee 100644 --- a/frontends/amiga/corewindow.c +++ b/frontends/amiga/corewindow.c @@ -44,7 +44,7 @@ #include "utils/utf8.h" #include "netsurf/keypress.h" #include "netsurf/mouse.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include <proto/exec.h> #include <proto/intuition.h> diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index 97debb686..3595f9606 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -978,7 +978,7 @@ static struct Menu *ami_menu_layout_gt(struct ami_menu_data **md, int max) TextLength(rp, md[i]->menulab, strlen(md[i]->menulab)) - icon_width - space_width; - if((md[i]->menutype == NM_ITEM) && (md[i+1]->menutype == NM_SUB)) { + if((md[i]->menutype == NM_ITEM) && md[i+1] && (md[i+1]->menutype == NM_SUB)) { left_posn -= menu_glyph_width[NSA_GLYPH_SUBMENU]; submenuarrow = NewObject(NULL, "sysiclass", |