From 6d21f840bd9d901ccd13d94c1a6f03fa0cec77ba Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 12 Mar 2010 19:16:00 +0000 Subject: [PATCH] fix crash when no default font available --- panda/src/grutil/frameRateMeter.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/panda/src/grutil/frameRateMeter.cxx b/panda/src/grutil/frameRateMeter.cxx index fe805a9b57..8c525ba7c7 100644 --- a/panda/src/grutil/frameRateMeter.cxx +++ b/panda/src/grutil/frameRateMeter.cxx @@ -45,7 +45,11 @@ FrameRateMeter(const string &name) : TextNode(name) { // The top of the visible frame is 80% of the line height, based on // the calculation within TextAssembler. - float height = get_font()->get_line_height() * 0.8; + float height = 1.0f; + TextFont *font = get_font(); + if (font != NULL){ + height = font->get_line_height() * 0.8; + } set_align(A_right); set_transform(LMatrix4f::scale_mat(frame_rate_meter_scale) *