try to fix yet another crash bug (don't worry, there's one for anybody!)

[flightgear.git] / src / ATC / ATCmgr.cxx

diff --git a/src/ATC/ATCmgr.cxx b/src/ATC/ATCmgr.cxx
index dfb483ace3408538a803713ee0534a5ffdf48e94..bbf99dfa620f2965f2796213d4b67ddbca58e6ff 100644 (file)
--- a/src/ATC/ATCmgr.cxx
+++ b/src/ATC/ATCmgr.cxx
@@ -16,16 +16,23 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <Airports/simple.hxx>
+
 #include "ATCmgr.hxx"
 #include "commlist.hxx"
-#include "ATCdisplay.hxx"
 #include "ATCDialog.hxx"
 #include "ATCutils.hxx"
+#include "transmissionlist.hxx"
+#include "ground.hxx"
+
 
 /*
 // periodic radio station search wrapper
@@ -110,8 +117,15 @@ void FGATCMgr::init() {
        // For now we'll do one hardwired one
        
        v1 = new FGATCVoice;
-       voiceOK = v1->LoadVoice("default");
-       voice = true;
+       try {
+               voiceOK = v1->LoadVoice("default");
+               voice = true;
+       } catch ( sg_io_exception & ) {
+               voiceOK  = false;
+               voice = false;
+               delete v1;
+               v1 = 0;
+       }
        
        /* I've loaded the voice even if /sim/sound/pause is true
        *  since I know no way of forcing load of the voice if the user