From 412a9461c01f0ea9662b886947c7569a3e4d1411 Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Mon, 12 Dec 2022 14:13:30 +0100 Subject: [PATCH] Fix conflict resolution between #6013 and #5948 Thanks @Robyt3 for noticing --- src/engine/server/server.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 34ccf160f..f7f8b2d9c 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -2547,12 +2547,12 @@ int CServer::Run() if(Config()->m_SvUseSQL) { - DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE_BACKUP, Config()->m_SvSqliteFile); + DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE_BACKUP, aFullPath); } else { - DbPool()->RegisterSqliteDatabase(CDbConnectionPool::READ, Config()->m_SvSqliteFile); - DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE, Config()->m_SvSqliteFile); + DbPool()->RegisterSqliteDatabase(CDbConnectionPool::READ, aFullPath); + DbPool()->RegisterSqliteDatabase(CDbConnectionPool::WRITE, aFullPath); } }