[Pkg-owncloud-commits] [owncloud-client] 308/470: Don't call reset() on a query after close() #4662

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 41b950b7e6c41de6165f038ac0800ec05353dc7c
Author: Christian Kamm <mail at ckamm.de>
Date:   Tue Apr 12 10:30:22 2016 +0200

    Don't call reset() on a query after close() #4662
---
 src/libsync/syncjournaldb.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp
index 215bd00..a4a27d4 100644
--- a/src/libsync/syncjournaldb.cpp
+++ b/src/libsync/syncjournaldb.cpp
@@ -806,14 +806,13 @@ SyncJournalFileRecord SyncJournalDb::getFileRecord(const QString& filename)
             if( !_getFileRecordQuery->nullValue(13) ) {
                 rec._contentChecksumType = _getFileRecordQuery->baValue(13);
             }
+            _getFileRecordQuery->reset_and_clear_bindings();
         } else {
             QString err = _getFileRecordQuery->error();
             qDebug() << "No journal entry found for " << filename << "Error: " << err;
             locker.unlock();
             close();
-            locker.relock();
         }
-        _getFileRecordQuery->reset_and_clear_bindings();
     }
     return rec;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git