SqlDatabase: Remove existing database before adding new

Fixes duplicate connection warning.
7 years ago · 4990eed417
parent b9c4a92aef
commit 4990eed417
1 changed files with 3 additions and 2 deletions
--- a/src/lib/tools/sqldatabase.cpp
+++ b/src/lib/tools/sqldatabase.cpp
@ -120,8 +120,9 @@ QSqlDatabase SqlDatabase::database()
    }

    if (!s_databases.hasLocalData()) {
-        const QString threadStr = QString::number((quintptr) QThread::currentThread());
-        QSqlDatabase db = QSqlDatabase::addDatabase(QSL("QSQLITE"), QSL("Falkon/") + threadStr);
+        const QString threadStr = QStringLiteral("Falkon/%1").arg((quintptr) QThread::currentThread());
+        QSqlDatabase::removeDatabase(threadStr);
+        QSqlDatabase db = QSqlDatabase::addDatabase(QSL("QSQLITE"), threadStr);
        db.setDatabaseName(m_databaseName);
        db.setConnectOptions(m_connectOptions);
        db.open();