Merge pull request #1053 from glebm/fix-crash-on-exit-3

robertosfield · web-flow · commit 34a1d8bc9bba · 2021-03-07T10:27:36.000Z
Ensure global Mutex is initialized before Registry
diff --git a/include/osgDB/Registry b/include/osgDB/Registry
@@ -50,7 +50,8 @@ namespace osgDB {
     The RegisterReaderWriterProxy can be used to automatically
     register at runtime a reader/writer with the Registry.
 */
-class OSGDB_EXPORT Registry : public osg::Referenced
+class OSGDB_EXPORT Registry : osg::depends_on<OpenThreads::Mutex*, osg::Referenced::getGlobalReferencedMutex>,
+                              public osg::Referenced
 {
     public:
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ namespace osgDB {`
`50`	`50`	`The RegisterReaderWriterProxy can be used to automatically`
`51`	`51`	`register at runtime a reader/writer with the Registry.`
`52`	`52`	`*/`
`53`		`-class OSGDB_EXPORT Registry : public osg::Referenced`
	`53`	`+class OSGDB_EXPORT Registry : osg::depends_on<OpenThreads::Mutex*, osg::Referenced::getGlobalReferencedMutex>,`
	`54`	`+ public osg::Referenced`
`54`	`55`	`{`
`55`	`56`	`public:`
`56`	`57`