summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-28 02:48:51 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-28 02:48:51 +0300
commitb375f3d5161164cedbdf98347d4f67b7f7ac3c43 (patch)
tree1a3df98d1d92da26bbaa79a1bcf905b3836fee6a /src
parent4cd8cf7f527553abad86c07c8ebbb2ba8b5d3699 (diff)
downloadmv-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.tar.gz
mv-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.tar.bz2
mv-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.tar.xz
mv-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.zip
Add fade out music also to local music.
Diffstat (limited to 'src')
-rw-r--r--src/localplayer.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 860b1cbe4..af0fab18b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -3283,7 +3283,12 @@ void LocalPlayer::updateCoords()
if (str.empty())
str = mMap->getMusicFile();
if (str != sound.getCurrentMusicFile())
- sound.playMusic(str);
+ {
+ if (str.empty())
+ sound.fadeOutMusic();
+ else
+ sound.fadeOutAndPlayMusic(str);
+ }
}
}