From e0443e017c94cd64f0ae76829637744377113ce3 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 21 Feb 2021 10:14:55 +1100
Subject: [PATCH] fixed merge connection issue

---
 app/widget/timelinewidget/timelineundo.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/widget/timelinewidget/timelineundo.h b/app/widget/timelinewidget/timelineundo.h
index 73a4a9f54..b8d5a82a9 100644
--- a/app/widget/timelinewidget/timelineundo.h
+++ b/app/widget/timelinewidget/timelineundo.h
@@ -1405,7 +1405,7 @@ public:
         const NodeInput& i = ic.second;
 
         // Ignore the track input, but funnel everything else through our merge
-        if (i.node() != timeline_->parent() && i.input() != timeline_->track_input()) {
+        if (i.node() != timeline_->parent() || i.input() != timeline_->track_input()) {
           Node::DisconnectEdge(last_track, i);
           Node::ConnectEdge(merge_, i);
         }