feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Don't call an empty abort callback

Browse Source 
Change-Id: I753aaa1ad693bb9ea5b34f1b50af40e2ef616c30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2022-01-12 12:55:26 +01:00
parent 68ac61193c
commit 146225b94b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/imagecache/imagecachecollector.cpp
View File

@@ -91,6 +91,7 @@ void ImageCacheCollector::start(Utils::SmallStringView name,
model->setRewriterView(&rewriterView); model->setRewriterView(&rewriterView);
if (rewriterView.inErrorState() || !rewriterView.rootModelNode().metaInfo().isGraphicalItem()) { if (rewriterView.inErrorState() || !rewriterView.rootModelNode().metaInfo().isGraphicalItem()) {
if (abortCallback)
abortCallback(ImageCache::AbortReason::Failed); abortCallback(ImageCache::AbortReason::Failed);
return; return;
} }
@@ -126,7 +127,7 @@ void ImageCacheCollector::start(Utils::SmallStringView name,
model->setNodeInstanceView({}); model->setNodeInstanceView({});
model->setRewriterView({}); model->setRewriterView({});
if (!capturedDataArrived) if (!capturedDataArrived && abortCallback)
abortCallback(ImageCache::AbortReason::Failed); abortCallback(ImageCache::AbortReason::Failed);
} }

1
src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
View File

@@ -137,6 +137,7 @@ void BaseConnectionManager::callCrashCallback()
{ {
std::lock_guard<std::mutex> lock{m_callbackMutex}; std::lock_guard<std::mutex> lock{m_callbackMutex};
if (m_crashCallback)
m_crashCallback(); m_crashCallback();
} }
} // namespace QmlDesigner } // namespace QmlDesigner