commit ee40db2fcd700d96bcba1ed2b6a9a9e75a76563a
Merge: b07602b5 552d300e
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Oct 28 01:27:15 2013 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Oct 28 01:27:15 2013 +0000
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2725
textscreen/txt_sdl.c | 39 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 21 deletions(-)
diff --cc textscreen/txt_sdl.c
index 488399d3,d098d196..20796dd5
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@@ -176,9 -175,13 +175,9 @@@ static void ChooseFont(void
// If in doubt and we can't get a list, always prefer to
// fall back to the normal font:
- if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
+ if (info == NULL)
{
-#ifdef _WIN32_WCE
- font = &small_font;
-#else
font = &main_font;
-#endif
return;
}