From 8622ff1c66f2821150893d88a1d2fe2895c10131 Mon Sep 17 00:00:00 2001 From: Terry Geng Date: Tue, 25 Feb 2020 10:09:05 +0800 Subject: [PATCH] fix: duckv placeholder problem. rm problem --- command.py | 5 +++-- configuration.default.ini | 2 +- interface.py | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/command.py b/command.py index 39b9461..75cdffb 100644 --- a/command.py +++ b/command.py @@ -531,8 +531,9 @@ def cmd_remove(bot, user, text, command, parameter): removed = None if index == var.playlist.current_index: removed = var.playlist.remove(index) - var.botamusique.stop() - var.botamusique.launch_music(index) + if bot.is_playing and not bot.is_pause: + bot.stop() + bot.launch_music(index) else: removed = var.playlist.remove(index) diff --git a/configuration.default.ini b/configuration.default.ini index 7a46224..818401d 100644 --- a/configuration.default.ini +++ b/configuration.default.ini @@ -147,7 +147,7 @@ drop_database = dropdatabase [strings] current_volume = Current volume: {volume} -current_ducking_volume = Volume on ducking: {volume} by {user} +current_ducking_volume = Volume on ducking: {volume} change_volume = Volume set to {volume} by {user} change_ducking_volume = Volume on ducking set to {volume} by {user} bad_command = {command}: command not found diff --git a/interface.py b/interface.py index ee439ad..7763095 100644 --- a/interface.py +++ b/interface.py @@ -219,8 +219,9 @@ def post(): if var.playlist.length() >= int(request.form['delete_music']): if int(request.form['delete_music']) == var.playlist.current_index: var.playlist.remove(int(request.form['delete_music'])) - var.botamusique.stop() - var.botamusique.launch_music(int(request.form['delete_music'])) + if var.botamusique.is_playing and not var.botamusique.is_pause: + var.botamusique.stop() + var.botamusique.launch_music(int(request.form['delete_music'])) else: var.playlist.remove(int(request.form['delete_music']))