From 08a0bf33a49833eb080c42b531634c61ed4e05b7 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 28 Oct 2015 09:55:55 -0700 Subject: [PATCH] avoid unneeded read-lock if action-data was dirty --- libraries/entities/src/EntityItem.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 701732b921..91ea4864df 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1795,12 +1795,13 @@ const QByteArray EntityItem::getActionData() const { EntityItem* unconstThis = const_cast(this); unconstThis->withWriteLock([&] { getActionDataInternal(); + result = _allActionsDataCache; + }); + } else { + withReadLock([&] { + result = _allActionsDataCache; }); } - - withReadLock([&] { - result = _allActionsDataCache; - }); return result; }