resolve merge conflict

2020-03-20 13:07:35 -04:00 · 2020-03-20 13:07:35 -04:00 · 590e249500
parent cea9705bbe 31c7cecaf9
commit 590e249500
1 changed files with 1 additions and 0 deletions
--- a/lib/storage/file.js
+++ b/lib/storage/file.js
@ -60,6 +60,7 @@ var channelExists = function (filepath, cb) {
 };

 const destroyStream = function (stream) {
+    if (!stream) { return; }
    try { stream.close(); } catch (err) { console.error(err); }
    setTimeout(function () {
        try { stream.destroy(); } catch (err) { console.error(err); }