[Qt] Call QSqlQuery::finish() when inactive

1 files changed, 10 insertions, 9 deletions

diff --git a/platform/qt/src/sqlite3.cpp b/platform/qt/src/sqlite3.cpp
index f5e5f7a690..1d18946364 100644
--- a/platform/qt/src/sqlite3.cpp
+++ b/platform/qt/src/sqlite3.cpp
@@ -305,18 +305,19 @@ void Statement::bindBlob(int offset, const std::vector<uint8_t>& value, bool ret
 bool Statement::run() {
     assert(impl);
 
-    if (impl->query.isValid()) {
-        return impl->query.next();
+    if (!impl->query.isValid()) {
+       if (impl->query.exec()) {
+           impl->lastInsertRowId = impl->query.lastInsertId().value<int64_t>();
+           impl->changes = impl->query.numRowsAffected();
+       } else {
+           checkQueryError(impl->query);
+       }
     }
 
-    if (!impl->query.exec()) {
-        checkQueryError(impl->query);
-    }
-
-    impl->lastInsertRowId = impl->query.lastInsertId().value<int64_t>();
-    impl->changes = impl->query.numRowsAffected();
+    const bool hasNext = impl->query.next();
+    if (!hasNext) impl->query.finish();
 
-    return impl->query.next();
+    return hasNext;
 }
 
 template bool Statement::get(int);