From adcc72eab814f672f42d56f3fdd5c57543f3e05d Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Thu, 9 Apr 2020 22:34:48 +0200
Subject: [PATCH] Open the right database (functions in bad order)
---
src/database/queue.c | 2 +-
src/net/listen.c | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/database/queue.c b/src/database/queue.c
index eb1d4509..1c807daf 100644
--- a/src/database/queue.c
+++ b/src/database/queue.c
@@ -16,7 +16,7 @@ database_queue_state(sqlite3 *db, struct lkt_queue_state *res)
"SELECT"
" volume, paused, random, repeat, single, current, duration, consume, "
" (SELECT COUNT(*) FROM queue) AS length "
- "FROM queue_state";
+ "FROM queue_state;\n";
sqlite3_stmt *stmt = 0;
bool ret = false;
diff --git a/src/net/listen.c b/src/net/listen.c
index 8818ad90..c2bda8ac 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -736,6 +736,14 @@ lkt_listen(void)
return 1;
}
+ /* Finish to initialize. */
+
+ if (!database_config_get_text(srv.db, "database", "db_path", db_path, PATH_MAX)) {
+ fprintf(stderr, " ! lkt_listen: Failed to get database path\n");
+ goto end_free_strings;
+ }
+
+
if (!database_open(srv.db, db_path)) {
fprintf(stderr, " ! lkt_listen: Failed to open database\n");
return 1;
@@ -748,11 +756,6 @@ lkt_listen(void)
return 1;
}
- if (!database_config_get_text(srv.db, "database", "db_path", db_path, PATH_MAX)) {
- fprintf(stderr, " ! lkt_listen: Failed to get database path\n");
- goto end_free_strings;
- }
-
if (!database_config_get_text(srv.db, "database", "kara_dir", kara_dir, PATH_MAX)) {
fprintf(stderr, " ! lkt_listen: Failed to get kara directory\n");
goto end_free_strings;
--
GitLab