From: Tim Moore <timoore@redhat.com>
Date: Sun, 20 Dec 2009 11:05:07 +0000 (+0100)
Subject: Merge branch 'timoore/merge-effects'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=15b6c431c051d04d501b12b5a47ca721964017f1;p=flightgear.git

Merge branch 'timoore/merge-effects'
---

15b6c431c051d04d501b12b5a47ca721964017f1
diff --cc src/Main/main.cxx
index 281da283f,cbdc0ba60..dac1bd432
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@@ -506,15 -489,10 +507,15 @@@ static void fgMainLoop( void ) 
      if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
          && cur_fdm_state->get_inited()) {
          fgSetBool("sim/sceneryloaded",true);
 -        fgSetFloat("/sim/sound/volume", init_volume);
 -        globals->get_soundmgr()->set_volume(init_volume);
 +        if (fgGetBool("/sim/sound/working")) {
 +            smgr->activate();
 +        } else {
 +            smgr->stop();
 +        }
 +        globals->get_props()->tie("/sim/sound/devices/name",
 +              SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
      }
- 
+     simgear::AtomicChangeListener::fireChangeListeners();
      fgRequestRedraw();
  
      SG_LOG( SG_ALL, SG_DEBUG, "" );