Reset pause flag even if there is nothing to resume.

wjp · Feb 5, 2008 · df2a49f · df2a49f
1 parent 30a6219
commit df2a49f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2008-02-05  Lars Skovlund  <[email protected]>
 
+	* 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
@@ -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