edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict resolution between #6013 and #5948

Browse source 
Thanks @Robyt3 for noticing
This commit is contained in:
Dennis Felsing 2022-12-12 14:13:30 +01:00
parent 34a5609535
commit 412a9461c0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/server/server.cpp
View file

@ -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);
}
}