From 337b8534e03819f7f7172e211ad68a0497748121 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Wed, 29 Jul 2009 11:17:25 +0000 Subject: [PATCH] Don't crash the app_server if the font couldn't be found. Fixes bug #4149, though it still has to be investigated why the font style isn't found. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31901 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/DesktopSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp index 79a26dd7d0..ec7ffc21db 100644 --- a/src/servers/app/DesktopSettings.cpp +++ b/src/servers/app/DesktopSettings.cpp @@ -164,7 +164,7 @@ DesktopSettingsPrivate::_Load() && settings.FindString("fixed style", &style) == B_OK && settings.FindFloat("fixed size", &size) == B_OK) { FontStyle* fontStyle = gFontManager->GetStyle(family, style); - if (fontStyle->IsFixedWidth()) + if (fontStyle != NULL && fontStyle->IsFixedWidth()) fFixedFont.SetStyle(fontStyle); fFixedFont.SetSize(size); }