From 83e9b891d87774e631f27a5b3261332a4e874d6f Mon Sep 17 00:00:00 2001
From: Fluffy Jenkins <richardjrn.w@gmail.com>
Date: Thu, 19 Dec 2019 23:31:10 +0000
Subject: [PATCH] Workaround for Secondary camera crash

---
 libraries/render/src/render/CullTask.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 068d6f9851..8cedbc7f3e 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -130,6 +130,10 @@ void FetchSpatialTree::configure(const Config& config) {
 }
 
 void FetchSpatialTree::run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemSpatialTree::ItemSelection& outSelection) {
+    if (!renderContext){
+        return;
+    }
+    
     // start fresh
     outSelection.clear();
 
@@ -142,6 +146,10 @@ void FetchSpatialTree::run(const RenderContextPointer& renderContext, const Inpu
         RenderArgs* args = renderContext->args;
         auto& scene = renderContext->_scene;
 
+        if (!args) {
+            return;
+        }
+
         auto queryFrustum = args->getViewFrustum();
         // Eventually use a frozen frustum
         if (_freezeFrustum) {