--- deliantra/Deliantra-Client/bin/cfplus	2007/07/12 18:28:34	1.164
+++ deliantra/Deliantra-Client/bin/cfplus	2007/07/12 19:13:20	1.166
@@ -504,6 +504,8 @@
    $SPELL_LIST->clear_spells;
    $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
 
+   &audio_music_set ([]);
+
    return unless $CONN;
 
    status "connection closed";
@@ -2043,7 +2045,7 @@
 sub audio_music_changed {
    return unless $CFG->{bgm_enable};
 
-   # default MUSIC_WANT, undef/0 == MUSIC_DEFAULT
+   # default MUSIC_WANT == MUSIC_DEFAULT
    @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
    
    # if the currently playing song is acceptable, let it continue
@@ -2051,11 +2053,8 @@
              && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
 
    if ($MUSIC_PLAYING) {
-      warn "fade out";
-      CFPlus::MixMusic::fade_out 1500;
+      CFPlus::MixMusic::fade_out 1000;
    } else {
-      warn "new music\n";
-
       my $music = $MUSIC_WANT [rand @MUSIC_WANT];
 
       $MUSIC_PLAYING = $music;