disable XftFontClose calls to avoid bug in X

diff --git a/cinelerra-5.0/guicast/bcwindowbase.C b/cinelerra-5.0/guicast/bcwindowbase.C
index 797dbbc62baa246f765bc43db3839f21b50b98c2..0845dcbb1603531a6bef899a562cd5662315b4d4 100644 (file)
--- a/cinelerra-5.0/guicast/bcwindowbase.C
+++ b/cinelerra-5.0/guicast/bcwindowbase.C
@@ -173,7 +173,9 @@ BC_WindowBase::~BC_WindowBase()
                XFreeFont(display, largefont);
                XFreeFont(display, bigfont);
 
-#ifdef HAVE_XFT
+// bug in X causes XRenderExtensionInfo to be damaged if this is done here
+//  left to be done in XCloseDisplay by Xlib.
+#if defined(HAVE_XFT) && 0
                if(bigfont_xft)
                        XftFontClose (display, (XftFont*)bigfont_xft);
                if(largefont_xft)
@@ -2253,9 +2255,6 @@ int BC_WindowBase::init_fonts()
 void BC_WindowBase::init_xft()
 {
 #ifdef HAVE_XFT
-// does not seem to be thread safe (07/06/2015)
-       static Mutex xft_lock;
-       xft_lock.lock("BC_WindowBase::init_xft");
        if(!(smallfont_xft =
                (resources.small_font_xft[0] == '-' ?
                        XftFontOpenXlfd(display, screen, resources.small_font_xft) :
@@ -2295,7 +2294,6 @@ void BC_WindowBase::init_xft()
                get_resources()->use_xft = 0;
                exit(1);
        }
-       xft_lock.unlock();
 #endif // HAVE_XFT
 }