1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00

Merge OCC22105 and OCC22360

This commit is contained in:
bugmaster 2011-04-28 16:33:34 +00:00 committed by bugmaster
parent 065bb8b023
commit c3d894867d

View File

@ -238,11 +238,16 @@ void OSD_FontMgr::InitFontDataBase() {
Handle(TCollection_HAsciiString) str = new TCollection_HAsciiString; Handle(TCollection_HAsciiString) str = new TCollection_HAsciiString;
Display * disp = XOpenDisplay("localhost:0.0"); Display * disp = XOpenDisplay("localhost:0.0");
if (!disp)
{
// let the X server find the available connection
disp = XOpenDisplay(":0.0");
if (!disp) if (!disp)
{ {
cout << "Display is NULL!" << endl; cout << "Display is NULL!" << endl;
return ; return ;
} }
}
Standard_Integer npaths = 0; Standard_Integer npaths = 0;