From 1dece1f4909c71ddbdd28e88fe66694fcc53e07e Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Thu, 3 Sep 2020 17:20:32 +0200 Subject: [PATCH] DB: Clear queue on stop --- src/base/commands.c | 3 ++- src/database/queue.c | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/base/commands.c b/src/base/commands.c index 5fc5b0ac..72ea19bf 100644 --- a/src/base/commands.c +++ b/src/base/commands.c @@ -245,7 +245,8 @@ command_playid(struct lkt_state *srv, char *args[LKT_MESSAGE_ARGS_MAX]) bool command_stop(struct lkt_state *srv, char __attribute__((unused)) *args[LKT_MESSAGE_ARGS_MAX]) { - RETURN_UNLESS(database_queue_stop(srv->db), "DB error", false); + RETURN_UNLESS(database_queue_stop(srv->db), "DB error on stop", false); + RETURN_UNLESS(database_queue_clear(srv->db), "DB error on clear", false); MOD_PROC(srv->window_mod, "close"); srv->mpd_idle_events |= MPD_IDLE_PLAYER; return true; diff --git a/src/database/queue.c b/src/database/queue.c index 1573e565..fbd07c5a 100644 --- a/src/database/queue.c +++ b/src/database/queue.c @@ -19,10 +19,12 @@ SQLITE_DO_ROLLBACK(db); \ return false; \ } -sqlite_just_exec(database_queue_toggle_pause, "UPDATE queue_state SET paused = 1 - paused;") -sqlite_just_exec(database_queue_crop, "DELETE FROM queue WHERE queue.kara_id <> (SELECT current FROM queue_state LIMIT 1);") -sqlite_just_exec(database_queue_stop, "UPDATE queue_state SET current = NULL;") -sqlite_just_exec(database_queue_clear, "DELETE FROM queue;DELETE FROM sqlite_sequence WHERE name = 'queue';UPDATE queue_state SET current = NULL;") +sqlite_just_exec(database_queue_toggle_pause, "UPDATE queue_state SET paused = 1 - paused;") +sqlite_just_exec(database_queue_crop, "DELETE FROM queue WHERE queue.kara_id <> (SELECT current FROM queue_state LIMIT 1);") +sqlite_just_exec(database_queue_stop, "UPDATE queue_state SET current = NULL;") +sqlite_just_exec(database_queue_clear, "DELETE FROM queue;DELETE FROM queue_tmp;" + "DELETE FROM sqlite_sequence WHERE name = 'queue_tmp';DELETE FROM sqlite_sequence WHERE name = 'queue';" + "UPDATE queue_state SET current = NULL;") sqlite_just_exec(database_config_queue_default, "UPDATE queue_state SET volume = 100, paused = 1, random = 0, repeat = 0, single = 0, consume = 0, current = NULL, duration = 0;") #undef sqlite_just_exec // *INDENT-ON* -- GitLab