From 21ffec315b8fa8a6b46351021da915236148a7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 12 Aug 2016 14:51:32 +0200 Subject: Make 'interrupt_wait' able to interrupt all waits If 'wait_id' is not specified, interrupt_wait will now stop all wait events. This fixes https://git.immae.eu/mantisbt/view.php?id=4 --- music_sampler/music_file.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'music_sampler/music_file.py') diff --git a/music_sampler/music_file.py b/music_sampler/music_file.py index fa6293d..4ba65e3 100644 --- a/music_sampler/music_file.py +++ b/music_sampler/music_file.py @@ -241,8 +241,7 @@ class MusicFile: self.current_audio_segment = new_audio_segment self.stop_playing() if wait: - if set_wait_id is not None: - self.mapping.add_wait_id(set_wait_id, self.wait_event) + self.mapping.add_wait(self.wait_event, wait_id=set_wait_id) self.wait_end() else: self.stopped() -- cgit v1.2.3