merge lock a non keeper current item everywhere, not just in the one …

…processing method #11
sobri909 · May 18, 2018 · 957fb3b · 957fb3b
1 parent 5d5b01f
commit 957fb3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/LocoKit/Base/Timelines/Items/TimelineItem.swift b/LocoKit/Base/Timelines/Items/TimelineItem.swift
@@ -24,7 +24,10 @@ open class TimelineItem: TimelineObject, Hashable, Comparable, Codable {
 
     public let itemId: UUID
 
-    open var isMergeLocked: Bool { return false }
+    open var isMergeLocked: Bool {
+        if isCurrentItem && !isWorthKeeping { return true }
+        return false
+    }
 
     public var hasBrokenEdges: Bool {
         if deleted { return false }

diff --git a/LocoKit/Base/Timelines/TimelineProcessor.swift b/LocoKit/Base/Timelines/TimelineProcessor.swift
@@ -52,7 +52,7 @@ public class TimelineProcessor {
                 workingItem.sanitiseEdges()
 
                 // add in the merges for one step forward
-                if let next = workingItem.nextItem, !next.isCurrentItem || next.isWorthKeeping {
+                if let next = workingItem.nextItem {
                     next.sanitiseEdges()
 
                     merges.insert(Merge(keeper: workingItem, deadman: next))