From db0f7a98848100cc843d6ca87d34a51153fc944a Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 11 Mar 2021 20:14:03 +1300
Subject: [PATCH] Fix flash of avatar entity when domain restarts

---
 libraries/networking/src/NodeList.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 1d7d6c257e..178566c7dc 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -1385,6 +1385,10 @@ void NodeList::startThread() {
 void NodeList::adjustCanRezAvatarEntitiesPermissions(const QJsonObject& domainSettingsObject,
         NodePermissions& permissions, bool notify) {
 
+    if (domainSettingsObject.isEmpty()) {
+        // Don't have enough information to adjust yet.
+        return;
+    }
 
     const double CANREZAVATARENTITIES_INTRODUCED_VERSION = 2.5;
     auto version = domainSettingsObject.value("version");