From ff570c4a6bf413d4feb00aadc268078e3559521c Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Tue, 28 Oct 2014 21:46:30 +0100 Subject: [PATCH] ownSql: Don't set busy timeout on bad object --- src/mirall/ownsql.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mirall/ownsql.cpp b/src/mirall/ownsql.cpp index da9d521f8b..4c24361f17 100644 --- a/src/mirall/ownsql.cpp +++ b/src/mirall/ownsql.cpp @@ -50,11 +50,14 @@ bool SqlDatabase::open( const QString& filename ) SQLITE_DO( sqlite3_open_v2(filename.toUtf8().constData(), &_db, flag, 0) ); if( _errId != SQLITE_OK ) { - close(); // FIXME: Correct? + qDebug() << Q_FUNC_INFO << "Error:" << _error; + close(); _db = 0; } - sqlite3_busy_timeout(_db, 5000); + if (_db) { + sqlite3_busy_timeout(_db, 5000); + } return isOpen(); }