fix: duckv placeholder problem. rm problem

This commit is contained in:
Terry Geng 2020-02-25 10:09:05 +08:00
parent 567d1749c7
commit 8622ff1c66
3 changed files with 7 additions and 5 deletions

View File

@ -531,8 +531,9 @@ def cmd_remove(bot, user, text, command, parameter):
removed = None removed = None
if index == var.playlist.current_index: if index == var.playlist.current_index:
removed = var.playlist.remove(index) removed = var.playlist.remove(index)
var.botamusique.stop() if bot.is_playing and not bot.is_pause:
var.botamusique.launch_music(index) bot.stop()
bot.launch_music(index)
else: else:
removed = var.playlist.remove(index) removed = var.playlist.remove(index)

View File

@ -147,7 +147,7 @@ drop_database = dropdatabase
[strings] [strings]
current_volume = Current volume: {volume} 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_volume = Volume set to {volume} by {user}
change_ducking_volume = Volume on ducking set to {volume} by {user} change_ducking_volume = Volume on ducking set to {volume} by {user}
bad_command = {command}: command not found bad_command = {command}: command not found

View File

@ -219,8 +219,9 @@ def post():
if var.playlist.length() >= int(request.form['delete_music']): if var.playlist.length() >= int(request.form['delete_music']):
if int(request.form['delete_music']) == var.playlist.current_index: if int(request.form['delete_music']) == var.playlist.current_index:
var.playlist.remove(int(request.form['delete_music'])) var.playlist.remove(int(request.form['delete_music']))
var.botamusique.stop() if var.botamusique.is_playing and not var.botamusique.is_pause:
var.botamusique.launch_music(int(request.form['delete_music'])) var.botamusique.stop()
var.botamusique.launch_music(int(request.form['delete_music']))
else: else:
var.playlist.remove(int(request.form['delete_music'])) var.playlist.remove(int(request.form['delete_music']))