From 811901a23a46242d3a6a5001e57681672eb3dd23 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 16 Mar 2021 18:32:14 +0100 Subject: [PATCH] Fix a crash that could happen when destroying LogsModel --- libnymea-app/models/logsmodel.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libnymea-app/models/logsmodel.cpp b/libnymea-app/models/logsmodel.cpp index 2eb30c58..c9020549 100644 --- a/libnymea-app/models/logsmodel.cpp +++ b/libnymea-app/models/logsmodel.cpp @@ -51,8 +51,13 @@ Engine *LogsModel::engine() const void LogsModel::setEngine(Engine *engine) { if (m_engine != engine) { + if (m_engine) { + disconnect(m_engine->logManager(), &LogManager::logEntryReceived, this, &LogsModel::newLogEntryReceived); + } m_engine = engine; - connect(engine->logManager(), &LogManager::logEntryReceived, this, &LogsModel::newLogEntryReceived); + if (m_engine) { + connect(engine->logManager(), &LogManager::logEntryReceived, this, &LogsModel::newLogEntryReceived); + } emit engineChanged(); } }