1 files changed, 7 insertions, 8 deletions
diff --git a/src/util/db/fwdsqlqueryselectresult.cpp b/src/util/db/fwdsqlqueryselectresult.cpp
index 3543756825..0b0c52c270 100644
--- a/src/util/db/fwdsqlqueryselectresult.cpp
+++ b/src/util/db/fwdsqlqueryselectresult.cpp
@@ -1,8 +1,7 @@
 #include "util/db/fwdsqlqueryselectresult.h"
 
-
 FwdSqlQuerySelectResult::FwdSqlQuerySelectResult()
-    : m_queryFinisher(m_query) {
+        : m_queryFinisher(&m_query) {
     DEBUG_ASSERT(!m_query.isActive());
 }
 
@@ -12,11 +11,11 @@ FwdSqlQuerySelectResult::FwdSqlQuerySelectResult()
 // be less efficient than actually moving the object's contents, but
 // meets all requirements.
 FwdSqlQuerySelectResult::FwdSqlQuerySelectResult(FwdSqlQuery&& query)
-    : m_query(std::move(query)),
-      // Pass a reference to the member to m_queryFinisher, because
-      // the contents of the r-value reference parameter might have
-      // been moved!
-      m_queryFinisher(m_query) {
+        : m_query(std::move(query)),
+          // Pass a reference to the member to m_queryFinisher, because
+          // the contents of the r-value reference parameter might have
+          // been moved!
+          m_queryFinisher(&m_query) {
     DEBUG_ASSERT(m_query.isActive());
     DEBUG_ASSERT(m_query.isSelect());
     // Verify that the query has just been executed and that
@@ -37,6 +36,6 @@ FwdSqlQuery FwdSqlQuerySelectResult::release() {
     FwdSqlQuery query(std::move(m_query));
     // Ensure that the wrapped query is inaccessible after moving it!
     m_query = FwdSqlQuery();
-    m_queryFinisher.release();
+    DEBUG_ASSERT(!m_query.isActive());
     return query;
 }