From c3d894867de57a0b8e5398b9f1ef22b7325ab1ab Mon Sep 17 00:00:00 2001
From: bugmaster <>
Date: Thu, 28 Apr 2011 16:33:34 +0000
Subject: [PATCH] Merge OCC22105 and OCC22360

---
 src/OSD/OSD_FontMgr.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/OSD/OSD_FontMgr.cxx b/src/OSD/OSD_FontMgr.cxx
index adec9c2c5d..4bb8596a6c 100755
--- a/src/OSD/OSD_FontMgr.cxx
+++ b/src/OSD/OSD_FontMgr.cxx
@@ -238,10 +238,15 @@ void OSD_FontMgr::InitFontDataBase() {
   Handle(TCollection_HAsciiString) str = new TCollection_HAsciiString;
   Display * disp = XOpenDisplay("localhost:0.0");
 
-  if ( !disp ) 
+  if (!disp) 
   {
-    cout << "Display is NULL!" << endl;
-    return ;
+    // let the X server find the available connection
+    disp = XOpenDisplay(":0.0");
+    if (!disp)
+    {
+      cout << "Display is NULL!" << endl;
+      return ;
+    }
   }
 
   Standard_Integer npaths = 0;
-- 
2.20.1