Merge branch 'timoore/merge-effects'

diff --cc src/Main/main.cxx
index 281da283f6fbc059fce27735aca7936c0cbfd99e,cbdc0ba60f1ece4c3d3cae8a07e1ee5e7ace94da..dac1bd432bd6ea973843040e800b5ecb712bf147
--- 1/src/Main/main.cxx
--- 2/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, "" );