From: Terry Geng Date: Tue, 10 Mar 2020 15:19:14 +0000 (+0800) Subject: fix: indent typo. update pymumble X-Git-Url: https://git.0d.be/?p=botaradio.git;a=commitdiff_plain;h=83649dc776688828e168966e078fa88438cc28ba fix: indent typo. update pymumble --- diff --git a/mumbleBot.py b/mumbleBot.py index 0ae9e42..4ee7d66 100644 --- a/mumbleBot.py +++ b/mumbleBot.py @@ -412,16 +412,16 @@ class MumbleBot: if not self.is_pause and (self.thread is None or not raw_music): # ffmpeg thread has gone. indicate that last song has finished, or something is wrong. - if self.read_pcm_size < 481 and len(var.playlist) > 0 and var.playlist.current_index != -1: + if self.read_pcm_size < 481 and len(var.playlist) > 0 and var.playlist.current_index != -1 \ + and self.last_ffmpeg_err: current = var.playlist.current_item() self.log.error("bot: cannot play music %s", current.format_debug_string()) - if self.last_ffmpeg_err: - self.log.error("bot: with ffmpeg error: %s", self.last_ffmpeg_err) - self.last_ffmpeg_err = "" + self.log.error("bot: with ffmpeg error: %s", self.last_ffmpeg_err) + self.last_ffmpeg_err = "" - self.send_msg(constants.strings('unable', item=current.format_short_string())) - var.playlist.remove_by_id(current.id) - var.cache.free_and_delete(current.id) + self.send_msg(constants.strings('unable_play', item=current.format_short_string())) + var.playlist.remove_by_id(current.id) + var.cache.free_and_delete(current.id) # move to the next song. if not self.wait_for_downloading: diff --git a/pymumble b/pymumble index 3cfdaa0..c95e536 160000 --- a/pymumble +++ b/pymumble @@ -1 +1 @@ -Subproject commit 3cfdaa0cf1a54290283cee656fdded6bb492c909 +Subproject commit c95e53633f41f662ef03c4fdaf295fa819c26675