From 2351e87333053ec007f64e4f84e353360b4a1e61 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Tue, 21 May 2013 15:10:44 +0200 Subject: [PATCH] * Try to work-around translated error messages. Loathing. --- src/libtomahawk/database/TomahawkSqlQuery.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/database/TomahawkSqlQuery.cpp b/src/libtomahawk/database/TomahawkSqlQuery.cpp index 97295b3ae..f7ca2ed90 100644 --- a/src/libtomahawk/database/TomahawkSqlQuery.cpp +++ b/src/libtomahawk/database/TomahawkSqlQuery.cpp @@ -23,6 +23,7 @@ #include "utils/TomahawkUtils.h" #include "utils/Logger.h" +#include #include #include #include @@ -85,8 +86,8 @@ TomahawkSqlQuery::exec() unsigned int retries = 0; while ( !QSqlQuery::exec() && ++retries < 10 ) { - if ( lastError().text().toLower().contains( "no query" ) || - lastError().text().toLower().contains( "parameter count mismatch" ) ) + if ( lastError().text() == QCoreApplication::translate( "QSQLiteResult", "No query" ) || + lastError().text() == QCoreApplication::translate( "QSQLiteResult", "Parameter count mismatch" ) ) { tDebug() << Q_FUNC_INFO << "Re-preparing query!"; @@ -162,5 +163,5 @@ TomahawkSqlQuery::isBusyError( const QSqlError& error ) const { const QString text = error.text().trimmed().toLower(); - return ( text.contains( "locked" ) || text.contains( "busy" ) ); + return ( error.number() == 5 || error.number() == 6 || text.contains( "locked" ) || text.contains( "busy" ) ); }