From 5349645b1cd65225e51b90bb1c27164c02b9d128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 14 Apr 2015 00:33:39 +0200 Subject: [PATCH] Fix potential crash when trying to render a char that could not be generated. --- .../cil/oc/client/renderer/font/DynamicFontRenderer.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala index 7f9d65583..543db431a 100644 --- a/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/font/DynamicFontRenderer.scala @@ -42,7 +42,7 @@ class DynamicFontRenderer extends TextureFontRenderer with IResourceManagerReloa textures.clear() charMap.clear() textures += new DynamicFontRenderer.CharTexture(this) - activeTexture = textures(0) + activeTexture = textures.head generateChars(basicChars.toCharArray) } @@ -68,9 +68,9 @@ class DynamicFontRenderer extends TextureFontRenderer with IResourceManagerReloa } override protected def drawChar(tx: Float, ty: Float, char: Char) { - val icon = charMap(char) - if (icon != null && icon.texture == activeTexture) { - icon.draw(tx, ty) + charMap.get(char) match { + case Some(icon) if icon.texture == activeTexture => icon.draw(tx, ty) + case _ => } }