Fix initialization order bug.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1476 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/freedv-server/source/driver_manager.cpp b/freedv-server/source/driver_manager.cpp
index 7b720dc8052e2391b9afb6801c9ce42e08d77d0c..09221d268ae0d2c1a501f126ebf7c4f403673eb7 100644 (file)
--- a/freedv-server/source/driver_manager.cpp
+++ b/freedv-server/source/driver_manager.cpp
@@ -258,6 +258,8 @@ namespace FreeDV {
   driver_manager()
   {
     extern DriverManager * _globalDriverManager;
+    if ( _globalDriverManager == 0 )
+      _globalDriverManager = new DriverManager();
 
     return _globalDriverManager;
   }

diff --git a/freedv-server/source/global.cpp b/freedv-server/source/global.cpp
index 789d0fbcc80fedb25e8df2185361bd68c5a39d21..f35f1eec705584bb42982dcc97ab0ea84df0b88a 100644 (file)
--- a/freedv-server/source/global.cpp
+++ b/freedv-server/source/global.cpp
@@ -2,5 +2,5 @@
 
 namespace FreeDV {
   const char * program_name = 0;
-  DriverManager * _globalDriverManager = new DriverManager();
+  DriverManager * _globalDriverManager = 0;
 }