From a0f20352408423d999757a264e6be92102a82d3d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 16 May 2020 00:31:24 +1000
Subject: [PATCH] cache: fixed segfault if a block was ever disconnected

---
 app/node/node.h                     | 10 ++++------
 app/node/output/track/track.cpp     | 10 ++++++++--
 app/render/backend/renderworker.cpp |  1 +
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/node/node.h b/app/node/node.h
index 46ac12f80..fb55ddb0c 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -431,7 +431,10 @@ protected:
 
   virtual QList<NodeInput*> GetInputsToHash() const;
 
-public slots:
+protected slots:
+  void InputChanged(const OLIVE_NAMESPACE::TimeRange &range);
+
+  void InputConnectionChanged(NodeEdgePtr edge);
 
 signals:
   /**
@@ -502,11 +505,6 @@ private:
    */
   QString label_;
 
-private slots:
-  void InputChanged(const OLIVE_NAMESPACE::TimeRange &range);
-
-  void InputConnectionChanged(NodeEdgePtr edge);
-
 };
 
 template<class T>
diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp
index 4fdc9835f..4bb8002e9 100644
--- a/app/node/output/track/track.cpp
+++ b/app/node/output/track/track.cpp
@@ -40,6 +40,8 @@ TrackOutput::TrackOutput() :
   AddInput(block_input_);
   connect(block_input_, &NodeInputArray::SubParamEdgeAdded, this, &TrackOutput::BlockConnected);
   connect(block_input_, &NodeInputArray::SubParamEdgeRemoved, this, &TrackOutput::BlockDisconnected);
+  disconnect(block_input_, &NodeInputArray::SubParamEdgeAdded, this, &TrackOutput::InputConnectionChanged);
+  disconnect(block_input_, &NodeInputArray::SubParamEdgeRemoved, this, &TrackOutput::InputConnectionChanged);
 
   muted_input_ = new NodeInput("muted_in", NodeParam::kBoolean);
   muted_input_->set_is_keyframable(false);
@@ -550,6 +552,8 @@ void TrackOutput::BlockConnected(NodeEdgePtr edge)
 
     emit BlockAdded(connected_block);
   }
+
+  InputConnectionChanged(edge);
 }
 
 void TrackOutput::BlockDisconnected(NodeEdgePtr edge)
@@ -558,11 +562,11 @@ void TrackOutput::BlockDisconnected(NodeEdgePtr edge)
   Node* connected_node = edge->output()->parentNode();
 
   // If this was a block, we would have put it in our block cache in BlockConnected()
-  if (connected_node->IsBlock()) {
+  int index_of_block = block_cache_.indexOf(static_cast<Block*>(connected_node));
+  if (index_of_block > -1) {
     Block* connected_block = static_cast<Block*>(connected_node);
 
     // Determine what index this block was in our cache and remove it
-    int index_of_block = block_cache_.indexOf(connected_block);
     block_cache_.removeAt(index_of_block);
 
     // If there were blocks following this one, update their ins/outs
@@ -581,6 +585,8 @@ void TrackOutput::BlockDisconnected(NodeEdgePtr edge)
 
     emit BlockRemoved(connected_block);
   }
+
+  InputConnectionChanged(edge);
 }
 
 void TrackOutput::BlockLengthChanged()
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index edf3481b0..685cc5364 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -458,6 +458,7 @@ void RenderWorker::Init(ViewerOutput* viewer)
 
 void RenderWorker::Close()
 {
+  // Delete all the nodes
   qDeleteAll(copy_map_);
   copy_map_.clear();