From 5af61d210cbc411fd79deb534fa960b3fa197ff9 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 7 Jul 2016 19:13:05 -0700 Subject: [PATCH] Correct ownership and deleteLater --- src/ViewWidgets/LogDownloadController.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ViewWidgets/LogDownloadController.cc b/src/ViewWidgets/LogDownloadController.cc index f11c2c4ff..4c8d614ae 100644 --- a/src/ViewWidgets/LogDownloadController.cc +++ b/src/ViewWidgets/LogDownloadController.cc @@ -675,6 +675,7 @@ void QGCLogModel::append(QGCLogEntry* object) { beginInsertRows(QModelIndex(), rowCount(), rowCount()); + QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership); _logEntries.append(object); endInsertRows(); emit countChanged(); @@ -688,7 +689,7 @@ QGCLogModel::clear(void) beginRemoveRows(QModelIndex(), 0, _logEntries.count()); while (_logEntries.count()) { QGCLogEntry* entry = _logEntries.last(); - if(entry) delete entry; + if(entry) entry->deleteLater(); _logEntries.removeLast(); } endRemoveRows(); -- 2.22.0