From 2dc73d04afb901b0e03fd695a78d7edc107354e1 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 6 Jun 2012 16:02:49 +0200 Subject: [PATCH] * Reuse precalculated connection name. --- src/libtomahawk/database/DatabaseImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index 6ad747104..635796e55 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -742,7 +742,7 @@ DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema ) if ( version > 0 && version != CURRENT_SCHEMA_VERSION ) { - QSqlDatabase::removeDatabase( "tomahawk" ); + QSqlDatabase::removeDatabase( connName ); QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version ); tLog() << endl << "****************************" << endl; @@ -753,7 +753,7 @@ DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema ) QFile::copy( dbname, newname ); { - m_db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" ); + m_db = QSqlDatabase::addDatabase( "QSQLITE", connName ); m_db.setDatabaseName( dbname ); if ( !m_db.open() ) throw "db moving failed";