projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clipedit remove vs delete
[goodguy/history.git]
/
cinelerra-5.0
/
guicast
/
bcwindowbase.C
diff --git
a/cinelerra-5.0/guicast/bcwindowbase.C
b/cinelerra-5.0/guicast/bcwindowbase.C
index d74cce3753ae6d1fe0827014576b46804862321b..797dbbc62baa246f765bc43db3839f21b50b98c2 100644
(file)
--- a/
cinelerra-5.0/guicast/bcwindowbase.C
+++ b/
cinelerra-5.0/guicast/bcwindowbase.C
@@
-2253,6
+2253,9
@@
int BC_WindowBase::init_fonts()
void BC_WindowBase::init_xft()
{
#ifdef HAVE_XFT
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) :
if(!(smallfont_xft =
(resources.small_font_xft[0] == '-' ?
XftFontOpenXlfd(display, screen, resources.small_font_xft) :
@@
-2292,6
+2295,7
@@
void BC_WindowBase::init_xft()
get_resources()->use_xft = 0;
exit(1);
}
get_resources()->use_xft = 0;
exit(1);
}
+ xft_lock.unlock();
#endif // HAVE_XFT
}
#endif // HAVE_XFT
}