Merge branch 'vivian/tachy' into next

[flightgear.git] / src / Main / fg_commands.cxx

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index 52b892a41d9d35991e1caf731d007e3fedc67ef1..c8b938473cd1218e06d305653c4166051fa0d0fd 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -189,7 +189,7 @@ do_exit (const SGPropertyNode * arg)
     fgSetBool("/sim/signals/exit", true);
 
     if (fgGetBool("/sim/startup/save-on-exit")) {
-#ifdef _MSC_VER
+#ifdef _WIN32
         char* envp = ::getenv( "APPDATA" );
         if ( envp != NULL ) {
             SGPath config( envp );
@@ -1259,8 +1259,8 @@ do_play_audio_sample (const SGPropertyNode * arg)
     try {
         static FGSampleQueue *queue = 0;
         if ( !queue ) {
-           SGSoundMgr *smgr = (SGSoundMgr *)globals->get_subsystem("soundmgr");
-           queue = new FGSampleQueue(smgr, "queue");
+           SGSoundMgr *smgr = globals->get_soundmgr();
+           queue = new FGSampleQueue(smgr, "chatter");
            queue->tie_to_listener();
         }