mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26037) -Fix (r26036): there was a reason they weren't references...

release/1.4
rubidium 2013-11-18 19:47:43 +00:00
parent a36fb735c0
commit 5b3d3b7240
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfx_layout.cpp
View File

@ -653,6 +653,9 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
} else { } else {
/* Line is new, layout it */ /* Line is new, layout it */
#ifdef WITH_ICU #ifdef WITH_ICU
FontState old_state = state;
const char *old_str = str;
GetLayouter<ICUParagraphLayout>(line, str, state); GetLayouter<ICUParagraphLayout>(line, str, state);
if (line.layout == NULL) { if (line.layout == NULL) {
static bool warned = false; static bool warned = false;
@ -660,6 +663,9 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
DEBUG(misc, 0, "ICU layouter bailed on the font. Falling back to the fallback layouter"); DEBUG(misc, 0, "ICU layouter bailed on the font. Falling back to the fallback layouter");
warned = true; warned = true;
} }
state = old_state;
str = old_str;
GetLayouter<FallbackParagraphLayout>(line, str, state); GetLayouter<FallbackParagraphLayout>(line, str, state);
} }
#else #else