diff --git a/src/db/plugins/simple/DatabaseSave.cxx b/src/db/plugins/simple/DatabaseSave.cxx index 5b93438f9..5c8a83321 100644 --- a/src/db/plugins/simple/DatabaseSave.cxx +++ b/src/db/plugins/simple/DatabaseSave.cxx @@ -20,7 +20,6 @@ #include "config.h" #include "DatabaseSave.hxx" #include "db/DatabaseLock.hxx" -#include "db/DatabaseError.hxx" #include "Directory.hxx" #include "DirectorySave.hxx" #include "fs/io/BufferedOutputStream.hxx" @@ -30,7 +29,6 @@ #include "fs/Charset.hxx" #include "util/StringCompare.hxx" #include "util/RuntimeError.hxx" -#include "Log.hxx" #include #include @@ -129,8 +127,6 @@ db_load_internal(TextFile &file, Directory &music_root) throw std::runtime_error("Tag list mismatch, " "discarding database file"); - LogDebug(db_domain, "reading DB"); - const ScopeDatabaseLock protect; directory_load(file, music_root); } diff --git a/src/db/plugins/simple/SimpleDatabasePlugin.cxx b/src/db/plugins/simple/SimpleDatabasePlugin.cxx index 54d9372de..958f52c12 100644 --- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx +++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx @@ -150,6 +150,8 @@ SimpleDatabase::Load() TextFile file(path); + LogDebug(simple_db_domain, "reading DB"); + db_load_internal(file, *root); FileInfo fi;