From c2156f12ff40f5aaf1c08d42bee0cf990a9be2bc Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 4 Sep 2007 12:38:42 +0000 Subject: [PATCH] Added mutex to DefaultFont::instance(). --- src/osgText/DefaultFont.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osgText/DefaultFont.cpp b/src/osgText/DefaultFont.cpp index 73205782d..d52ad21a6 100644 --- a/src/osgText/DefaultFont.cpp +++ b/src/osgText/DefaultFont.cpp @@ -20,6 +20,7 @@ using namespace osgText; + DefaultFont::DefaultFont() { _minFilterHint = osg::Texture::LINEAR_MIPMAP_LINEAR; @@ -33,6 +34,9 @@ DefaultFont::~DefaultFont() DefaultFont* DefaultFont::instance() { + static OpenThreads::Mutex s_DefaultFontMutex; + OpenThreads::ScopedLock lock(s_DefaultFontMutex); + static osg::ref_ptr s_defaultFont = new DefaultFont; return s_defaultFont.get(); }