From 146225b94b125adf374bcdfeb6873fc3deb9cf37 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 12 Jan 2022 12:55:26 +0100 Subject: [PATCH] QmlDesigner: Don't call an empty abort callback Change-Id: I753aaa1ad693bb9ea5b34f1b50af40e2ef616c30 Reviewed-by: Thomas Hartmann --- .../designercore/imagecache/imagecachecollector.cpp | 5 +++-- .../designercore/instances/baseconnectionmanager.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp index c32dd1e1839..b4f50848b9a 100644 --- a/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp +++ b/src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp @@ -91,7 +91,8 @@ void ImageCacheCollector::start(Utils::SmallStringView name, model->setRewriterView(&rewriterView); if (rewriterView.inErrorState() || !rewriterView.rootModelNode().metaInfo().isGraphicalItem()) { - abortCallback(ImageCache::AbortReason::Failed); + if (abortCallback) + abortCallback(ImageCache::AbortReason::Failed); return; } @@ -126,7 +127,7 @@ void ImageCacheCollector::start(Utils::SmallStringView name, model->setNodeInstanceView({}); model->setRewriterView({}); - if (!capturedDataArrived) + if (!capturedDataArrived && abortCallback) abortCallback(ImageCache::AbortReason::Failed); } diff --git a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp index 39590beadf7..f1e1e933b65 100644 --- a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp @@ -137,7 +137,8 @@ void BaseConnectionManager::callCrashCallback() { std::lock_guard lock{m_callbackMutex}; - m_crashCallback(); + if (m_crashCallback) + m_crashCallback(); } } // namespace QmlDesigner