Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminated a crash because of a race condition on server shutdown

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6206 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2004-01-21 01:17:12 +00:00
parent 03df40f1df
commit 2120f0b38d
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/servers/app/server/ViewDriver.cpp
View File

@ -72,6 +72,8 @@ VDWIN_SETCURSOR,
extern RGBColor workspace_default_color; extern RGBColor workspace_default_color;
bool is_initialized=false;
VDView::VDView(BRect bounds) VDView::VDView(BRect bounds)
: BView(bounds,"viewdriver_view",B_FOLLOW_ALL, B_WILL_DRAW) : BView(bounds,"viewdriver_view",B_FOLLOW_ALL, B_WILL_DRAW)
@ -499,7 +501,13 @@ bool VDWindow::QuitRequested(void)
{ {
write_port(serverport,B_QUIT_REQUESTED,NULL,0); write_port(serverport,B_QUIT_REQUESTED,NULL,0);
} }
// We actually have to perform the internal equivalent of calling Shutdown
// to eliminate a race condition. If a ServerWindow attempts to call a driver
// function after the window has closed but before the AppServer instance
// has called Shutdown, we end up with a crash inside one of the graphics
// methods
is_initialized=false;
return true; return true;
} }
@ -596,6 +604,7 @@ void ViewDriver::SetMode(const display_mode &mode)
if(!tempbmp->IsValid()) if(!tempbmp->IsValid())
{ {
screenwin->Unlock();
delete tempbmp; delete tempbmp;
return; return;
} }
@ -1709,7 +1718,10 @@ float ViewDriver::StringWidth(const char *string, int32 length, LayerData *d)
error=FT_New_Face(ftlib, style->GetPath(), 0, &face); error=FT_New_Face(ftlib, style->GetPath(), 0, &face);
if(error) if(error)
{
screenwin->Unlock();
return 0.0; return 0.0;
}
slot=face->glyph; slot=face->glyph;
@ -1717,7 +1729,10 @@ float ViewDriver::StringWidth(const char *string, int32 length, LayerData *d)
error=FT_Set_Char_Size(face, 0,int32(font->Size())*64,72,72); error=FT_Set_Char_Size(face, 0,int32(font->Size())*64,72,72);
if(error) if(error)
{
screenwin->Unlock();
return 0.0; return 0.0;
}
// set the pen position in 26.6 cartesian space coordinates // set the pen position in 26.6 cartesian space coordinates
pen.x=0; pen.x=0;
@ -1761,7 +1776,10 @@ float ViewDriver::StringHeight(const char *string, int32 length, LayerData *d)
FontStyle *style=font->Style(); FontStyle *style=font->Style();
if(!style) if(!style)
{
screenwin->Unlock();
return 0.0; return 0.0;
}
FT_Face face; FT_Face face;
FT_GlyphSlot slot; FT_GlyphSlot slot;
@ -1777,7 +1795,10 @@ float ViewDriver::StringHeight(const char *string, int32 length, LayerData *d)
error=FT_Set_Char_Size(face, 0,int32(font->Size())*64,72,72); error=FT_Set_Char_Size(face, 0,int32(font->Size())*64,72,72);
if(error) if(error)
{
screenwin->Unlock();
return 0.0; return 0.0;
}
slot=face->glyph; slot=face->glyph;

1
src/servers/app/server/ViewDriver.h
View File

@ -194,7 +194,6 @@ protected:
// drawing_mode drawmode; // drawing_mode drawmode;
rgb_color highcolor,lowcolor; rgb_color highcolor,lowcolor;
bool is_initialized;
}; };
#endif #endif