From df2a49f7df0a004cbe19516e046d1b1be780c997 Mon Sep 17 00:00:00 2001 From: Lars Skovlund Date: Tue, 5 Feb 2008 10:51:00 +0000 Subject: [PATCH] Reset pause flag even if there is nothing to resume. --- ChangeLog | 3 +++ src/sfx/player/polled.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4d42beba..6c978874 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-02-05 Lars Skovlund + * src/sfx/player/polled.c (pp_resume): Reset pause flag even when + there is nothing to resume. + * src/sfx/player/polled.c (pp_add_iterator): Fix race condition with the mixer. diff --git a/src/sfx/player/polled.c b/src/sfx/player/polled.c index dde81284..8cf38880 100644 --- a/src/sfx/player/polled.c +++ b/src/sfx/player/polled.c @@ -286,7 +286,10 @@ static int pp_resume(void) { if (!play_it) + { + play_paused = 0; return SFX_OK; /* Nothing to resume */ + } if (play_paused) new_song = 1; /* Fake starting a new song, re-using the old