summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/Makefile.target1
-rwxr-xr-xamiga/font.c6
2 files changed, 3 insertions, 4 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 235944915..1820a90bb 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -120,7 +120,6 @@ netsurf.lha: $(EXETARGET)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
-# $(call split_install_messages, ami, $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/)
$(Q)cp -r $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
$(Q)cp -r $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp \!NetSurf/Resources/AdBlock,f79 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
diff --git a/amiga/font.c b/amiga/font.c
index 21f26358f..310d8bec3 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -327,8 +327,6 @@ bool nsfont_split(const plot_font_style_t *fstyle,
utf16next, emwidth);
}
- tx += tempx;
-
/* Check whether we have a space */
if (*(string + utf8_pos) == ' ') {
/* Got a space */
@@ -343,6 +341,8 @@ bool nsfont_split(const plot_font_style_t *fstyle,
}
}
+ tx += tempx;
+
if ((x < tx) && (*char_offset != 0)) {
/* Reached available width, and a space was found;
* split there. */
@@ -352,7 +352,7 @@ bool nsfont_split(const plot_font_style_t *fstyle,
utf16 = utf16next;
utf8_pos = utf8_next(string, length, utf8_pos);
- };
+ }
free(outf16);