Commit eb430e6b authored by John Tourtellott's avatar John Tourtellott Committed by Kitware Robot

Merge topic 'linux-observer-fix'

ae0a5cd1 Instantiate attribute pointer in when calling observers
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !1486
parents c1e5d1c2 ae0a5cd1
Pipeline #131058 running with stage
......@@ -118,10 +118,13 @@ void pqSMTKCallObserversOnMainThreadBehavior::forceObserversToBeCalledOnMainThre
auto op = m_activeOperations[id];
if (auto operation = op.lock())
{
operation->manager()->observers().callObserversDirectly(operation,
static_cast<smtk::operation::EventType>(event),
!resultName.isNull() ? operation->specification()->findAttribute(resultName.toStdString())
: nullptr);
smtk::attribute::AttributePtr att;
if (!resultName.isNull())
{
att = operation->specification()->findAttribute(resultName.toStdString());
}
operation->manager()->observers().callObserversDirectly(
operation, static_cast<smtk::operation::EventType>(event), att);
}
m_activeOperations.erase(id);
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment