From 56f68504bf886f194f40fbd2aa451a7c288049e2 Mon Sep 17 00:00:00 2001
From: Moritz Langenstein <ml5717@ic.ac.uk>
Date: Fri, 1 Nov 2019 00:16:46 +0000
Subject: [PATCH] (ml5717) Fixed erasing merge conflict
---
src/queue.js | 2 ++
src/room.js | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/queue.js b/src/queue.js
index 9d23d00..6aeed44 100644
--- a/src/queue.js
+++ b/src/queue.js
@@ -76,6 +76,8 @@ self.onmessage = (event) => {
message.set(slice.message, offset)
offset += slice.message.length
}
+
+ delete messages[event.data.message.uuid]
}
if (event.data.message.compressed) {
diff --git a/src/room.js b/src/room.js
index 6544514..d53c244 100644
--- a/src/room.js
+++ b/src/room.js
@@ -70,7 +70,6 @@ class Room extends EventTarget {
p[1],
p[2],
p[3],
- p[4],
!eraseSet.get(i.toString()),
])
}
--
GitLab