From 8796aef74f77eba4eb37f54f262f29e021501222 Mon Sep 17 00:00:00 2001
From: bruceperens <bruceperens@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Tue, 25 Mar 2014 04:49:18 +0000
Subject: [PATCH] Fix initialization order bug.

git-svn-id: https://svn.code.sf.net/p/freetel/code@1476 01035d8c-6547-0410-b346-abe4f91aad63
---
 freedv-server/source/driver_manager.cpp | 2 ++
 freedv-server/source/global.cpp         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/freedv-server/source/driver_manager.cpp b/freedv-server/source/driver_manager.cpp
index 7b720dc8..09221d26 100644
--- 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 789d0fbc..f35f1eec 100644
--- 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;
 }
-- 
2.25.1