From 221cba826e73bdee3f7b4e4f2f3003b56363e896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 30 Jul 2012 18:06:25 +0200 Subject: [PATCH] checkValidDB ahora cierra adecuadamente la base de datos despu?s de comprobar la versi?n --- YACReaderLibrary/db/data_base_management.cpp | 25 ++++++-------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/YACReaderLibrary/db/data_base_management.cpp b/YACReaderLibrary/db/data_base_management.cpp index 8d9d1aa2..e9530de4 100644 --- a/YACReaderLibrary/db/data_base_management.cpp +++ b/YACReaderLibrary/db/data_base_management.cpp @@ -487,31 +487,20 @@ void DataBaseManagement::bindInt(const QString & name, const QSqlRecord & record QString DataBaseManagement::checkValidDB(const QString & fullPath) { QSqlDatabase db = loadDatabaseFromFile(fullPath); + QString versionString = ""; if(db.isValid() && db.isOpen()) { QSqlQuery version(db); version.prepare("SELECT * FROM db_info"); version.exec(); - if(version.next()) - { - db.close(); - QSqlDatabase::removeDatabase(fullPath); - return version.record().value("version").toString(); - } - else - { - db.close(); - QSqlDatabase::removeDatabase(fullPath); - return ""; - } + if(version.next()) + versionString = version.record().value("version").toString(); } - else - { - db.close(); - QSqlDatabase::removeDatabase(fullPath); - return ""; - } + + db.close(); + QSqlDatabase::removeDatabase(fullPath); + return versionString; } int DataBaseManagement::compareVersions(const QString & v1, const QString v2)