1 files changed, 25 insertions, 1 deletions
diff --git a/src/scxml/qscxmlstatemachine.cpp b/src/scxml/qscxmlstatemachine.cpp
index e57630f..9767a03 100644
--- a/src/scxml/qscxmlstatemachine.cpp
+++ b/src/scxml/qscxmlstatemachine.cpp
@@ -731,7 +731,9 @@ void QScxmlStateMachinePrivate::emitStateActive(int stateIndex, bool active)
 {
     Q_Q(QScxmlStateMachine);
     void *args[] = { Q_NULLPTR, const_cast<void*>(reinterpret_cast<const void*>(&active)) };
-    QMetaObject::activate(q, m_metaObject, stateIndex, args);
+    const int signalIndex = m_stateIndexToSignalIndex.value(stateIndex, -1);
+    if (signalIndex >= 0)
+        QMetaObject::activate(q, m_metaObject, signalIndex, args);
 }
 
 void QScxmlStateMachinePrivate::emitInvokedServicesChanged()
@@ -755,6 +757,26 @@ void QScxmlStateMachinePrivate::attach(QScxmlStateMachineInfo *info)
                      info, &QScxmlStateMachineInfo::transitionsTriggered);
 }
 
+void QScxmlStateMachinePrivate::updateMetaCache()
+{
+    m_stateIndexToSignalIndex.clear();
+
+    if (!m_tableData)
+        return;
+
+    if (!m_stateTable)
+        return;
+
+    int signalIndex = 0;
+    for (int i = 0; i < m_stateTable->stateCount; ++i) {
+        const auto &s = m_stateTable->state(i);
+        if (!s.isHistoryState() && s.type != StateTable::State::Invalid) {
+            m_stateIndexToSignalIndex.insert(i, signalIndex);
+            ++signalIndex;
+        }
+    }
+}
+
 QStringList QScxmlStateMachinePrivate::stateNames(const std::vector<int> &stateIndexes) const
 {
     QStringList names;
@@ -1767,6 +1789,8 @@ void QScxmlStateMachine::setTableData(QScxmlTableData *tableData)
                 == QScxmlExecutableContent::StateTable::terminator);
     }
 
+    d->updateMetaCache();
+
     emit tableDataChanged(tableData);
 }