From 944255a37b4bf8e3c8f16500231f876279e64b16 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 22 Mar 2017 22:44:05 -0700
Subject: [PATCH] Fix crash in render-perf-test

---
 libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 8c4498edc6..fb6054a514 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -996,7 +996,7 @@ void EntityTreeRenderer::checkAndCallPreload(const EntityItemID& entityID, const
         }
         bool shouldLoad = entity->shouldPreloadScript() && _entitiesScriptEngine;
         QString scriptUrl = entity->getScript();
-        if ((unloadFirst && shouldLoad) || scriptUrl.isEmpty()) {
+        if (shouldLoad && (unloadFirst || scriptUrl.isEmpty())) {
             _entitiesScriptEngine->unloadEntityScript(entityID);
             entity->scriptHasUnloaded();
         }