forked from qt-creator/qt-creator
QmlDesigner: Don't call an empty abort callback
Change-Id: I753aaa1ad693bb9ea5b34f1b50af40e2ef616c30 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -91,6 +91,7 @@ void ImageCacheCollector::start(Utils::SmallStringView name,
|
||||
model->setRewriterView(&rewriterView);
|
||||
|
||||
if (rewriterView.inErrorState() || !rewriterView.rootModelNode().metaInfo().isGraphicalItem()) {
|
||||
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);
|
||||
}
|
||||
|
||||
|
@@ -137,6 +137,7 @@ void BaseConnectionManager::callCrashCallback()
|
||||
{
|
||||
std::lock_guard<std::mutex> lock{m_callbackMutex};
|
||||
|
||||
if (m_crashCallback)
|
||||
m_crashCallback();
|
||||
}
|
||||
} // namespace QmlDesigner
|
||||
|
Reference in New Issue
Block a user