summaryrefslogtreecommitdiff
path: root/components/music
diff options
context:
space:
mode:
authorGene Z. Ragan <gzr@eazel.com>2000-12-09 09:55:17 +0000
committerGene Ragan <gzr@src.gnome.org>2000-12-09 09:55:17 +0000
commitdeca632a5a3ab3f2e86f2a2854d2cdbaf3b6eb78 (patch)
tree09b3a55465515cd64b0a8dfe28c8839632cd4371 /components/music
parent6db05779c505ec50a3e166179f109e6b74ea87a1 (diff)
downloadnautilus-deca632a5a3ab3f2e86f2a2854d2cdbaf3b6eb78.tar.gz
Fixed bug 5102, Changing to or from Music View advances song in second
2000-12-08 Gene Z. Ragan <gzr@eazel.com> Fixed bug 5102, Changing to or from Music View advances song in second window. * components/music/nautilus-music-view.c: (stop_playing_file): Only stop playback if playback is occurring. Otherwise esd get's confused and temporarily halts playback causeing the status callback to advnace the song counter in any music view that is playing.
Diffstat (limited to 'components/music')
-rw-r--r--components/music/nautilus-music-view.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index 0f68cc60b..756fcc67a 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -1789,8 +1789,14 @@ start_playing_file (NautilusMusicView *music_view, const char *file_name)
static void
stop_playing_file (NautilusMusicView *music_view)
{
- mpg123_stop ();
- set_player_state (music_view, PLAYER_STOPPED);
+ PlayerState state;
+
+ state = get_player_state (music_view);
+
+ if (state == PLAYER_PLAYING || state == PLAYER_PAUSED) {
+ mpg123_stop ();
+ set_player_state (music_view, PLAYER_STOPPED);
+ }
}
static PlayerState