i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't crash if the system fonts are not initialized

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12388 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-04-14 00:12:06 +00:00
parent bd841e3cd4
commit 8fdfa137d6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/Painter/Painter.cpp
+6 -1
View File
@@ -67,7 +67,7 @@ Painter::Painter()
fTextRenderer(new AGGTextRenderer()), fTextRenderer(new AGGTextRenderer()),
fLastFamilyAndStyle(0) fLastFamilyAndStyle(0)
{ {
if (fontserver) if (fontserver && fontserver->GetSystemPlain())
fFont = *fontserver->GetSystemPlain(); fFont = *fontserver->GetSystemPlain();
_UpdateFont(); _UpdateFont();
@@ -1105,6 +1105,11 @@ Painter::_RebuildClipping()
void void
Painter::_UpdateFont() Painter::_UpdateFont()
{ {
// TODO: temporary work arround until ServerFont
// is guaranteed to be valid.
if (fFont.InitCheck() < B_OK)
return;
if (fLastFamilyAndStyle != fFont.GetFamilyAndStyle()) { if (fLastFamilyAndStyle != fFont.GetFamilyAndStyle()) {
fLastFamilyAndStyle = fFont.GetFamilyAndStyle(); fLastFamilyAndStyle = fFont.GetFamilyAndStyle();