web/cryptpad
Archived
5
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
ansuz committed 2020-03-20 13:07:35 -04:00
2 parents cea9705bbe 31c7cecaf9
commit 590e249500
1 file changed
+1
Download Patch File Download Diff File Expand all files Collapse all files
lib/storage/file.js
+1
View File
@@ -60,6 +60,7 @@ var channelExists = function (filepath, cb) {
}; };
const destroyStream = function (stream) { const destroyStream = function (stream) {
if (!stream) { return; }
try { stream.close(); } catch (err) { console.error(err); } try { stream.close(); } catch (err) { console.error(err); }
setTimeout(function () { setTimeout(function () {
try { stream.destroy(); } catch (err) { console.error(err); } try { stream.destroy(); } catch (err) { console.error(err); }