Merge lp:~widelands-dev/widelands/bug-1530723 into lp:widelands

[GunChleoc]

WordWrap no longer checks the safety margin for empty text. This fixes a crash in the Game Results screen.

The game results screen for Collectors should no longer crash with an assert error.

[bunnybot (widelandsofficial)]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~widelands-dev/widelands/bug-1530723 mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_bug_1530723

You can give me commands by starting a line with @bunnybot <command>. I understand:
 merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set.

[bunnybot (widelandsofficial)]

Travis build 348 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/104266073.

[kaputtnik (franku)]

No crash anymore when winning a game :-)

review: Approve (functionality)

[TiborB (tiborb95)]

Code looks good :)

my first bunnybot merge:)

@bunnybot merge

review: Approve

=== modified file 'src/graphic/wordwrap.cc'
--- src/graphic/wordwrap.cc	2015-12-13 18:35:45 +0000
+++ src/graphic/wordwrap.cc	2016-01-23 10:28:07 +0000
@@ -148,7 +148,7 @@
 	 uint32_t safety_margin)
 {
 	std::string::size_type minimum_chars = 1; // So we won't get empty lines
-	assert(m_wrapwidth > safety_margin);
+	assert(text.empty() || m_wrapwidth > safety_margin);
 
 	std::string::size_type orig_end = text.find('\n', line_start);
 	if (orig_end == std::string::npos)