fife-parpg: engine/core/video/fonts/fontbase.cpp comparison

Fixes a freeze when setting text in a label with word_wrap enabled. [t:408]

comparison

equal deleted inserted replaced

-:70ba57cd9d18
+:6dace911ac2d
 		std::string line;
 		std::string::const_iterator pos = text.begin();
 		std::list<std::pair<size_t,std::string::const_iterator> > break_pos;
 		bool firstLine = true;
-		while( pos != text.end() )
+		while( pos != text.end())
 		{
 			break_pos.clear();
 			if( !firstLine ) {
 				line =  "\n";
 			} else {
 				firstLine = false;
 			}
 			bool haveNewLine = false;
 			while( getWidth(line) < render_width && pos != text.end() )
 			{
 				uint32_t codepoint = utf8::next(pos, text.end());
 				if (codepoint == whitespace && !line.empty())
 			if( break_pos.empty() ) {
 				// No break position and line length smaller than 2
 				// means the renderwidth is really screwed. Just continue
 				// appending single character lines.
-				if( utf8::distance(line.begin(),line.end()) <= 1 ) {
+				if( utf8::distance(line.begin(),line.end()) <= 1 && line != "\n") {
 					output.append(line);
 					continue;
+				}
+				if (line == "\n") {
+					++pos;
 				}
 				// We can't do hyphenation here,
 				// so we just retreat one character :-(
 				// FIXME

Mercurial > fife-parpg