unmangle merge

This commit is contained in:
Seth Alves 2015-11-03 13:50:35 -08:00
parent dba9eb7046
commit f60b1d9bd7

View file

@ -1861,7 +1861,6 @@ const QByteArray EntityItem::getActionDataInternal() const {
const QByteArray EntityItem::getActionData() const {
QByteArray result;
assertUnlocked();
if (_actionDataDirty) {
withWriteLock([&] {