From ebb3ad33ffdb950edf159d5bbcf14b56191ac0b2 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 10 Dec 2011 12:56:37 +0000 Subject: (svn r23472) -Fix [FS#4877]: the monospace font broke the bootstrap GUI's ability to find a font --- src/strings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/strings.cpp') diff --git a/src/strings.cpp b/src/strings.cpp index 06c4132d5..e15d30e00 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1778,7 +1778,7 @@ bool MissingGlyphSearcher::FindMissingGlyphs(const char **str) InitFreeType(this->Monospace()); const Sprite *question_mark[FS_END]; - for (FontSize size = FS_BEGIN; size < FS_END; size++) { + for (FontSize size = this->Monospace() ? FS_MONO : FS_BEGIN; size < (this->Monospace() ? FS_END : FS_MONO); size++) { question_mark[size] = GetGlyph(size, '?'); } @@ -1903,12 +1903,12 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher) ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_WARNING); /* Reset the font width */ - LoadStringWidthTable(); + LoadStringWidthTable(searcher->Monospace()); return; } /* Update the font with cache */ - LoadStringWidthTable(); + LoadStringWidthTable(searcher->Monospace()); #if !defined(WITH_ICU) /* -- cgit v1.2.3-54-g00ecf