From aff941a8338d5c1adee2a867e549b6f861278317 Mon Sep 17 00:00:00 2001 From: figec Date: Fri, 19 Jun 2015 19:04:11 +0300 Subject: [PATCH] More correct wrap_rows implementation --- src/util/string.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/util/string.h b/src/util/string.h index b4ce5743d..6980060e4 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -426,18 +426,12 @@ inline std::string wrap_rows(const std::string &from, { std::string to; - bool need_to_wrap = false; - size_t character_idx = 0; for (size_t i = 0; i < from.size(); i++) { - if (character_idx > 0 && character_idx % row_len == 0) - need_to_wrap = true; if (!IS_UTF8_MULTB_INNER(from[i])) { - // Wrap string if needed before next char started - if (need_to_wrap) { + // Wrap string after last inner byte of char + if (character_idx > 0 && character_idx % row_len == 0) to += '\n'; - need_to_wrap = false; - } character_idx++; } to += from[i];