From 59468ec77cc84fb1c2e52aef042f039d26b5f1e1 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Wed, 2 Dec 2015 20:59:46 -0800 Subject: [PATCH] Add safeguard to prevent #539 --- src/channel/playlist.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/channel/playlist.js b/src/channel/playlist.js index 75e98bc1..e9e00a21 100644 --- a/src/channel/playlist.js +++ b/src/channel/playlist.js @@ -475,16 +475,29 @@ PlaylistModule.prototype.queueStandard = function (user, data) { } function handleLookup() { + var channelName = self.channel.name; InfoGetter.getMedia(data.id, data.type, function (err, media) { if (err) { error(XSS.sanitizeText(String(err))); - self.channel.activeLock.release(); + if (self.channel && self.channel.activeLock) { + self.channel.activeLock.release(); + } else { + Logger.errlog.log("Attempted release of channel lock after " + + "channel was already unloaded in queueStandard: " + + channelName + " " + data.type + ":" + data.id); + } return lock.release(); } self._addItem(media, data, user, function () { lock.release(); - self.channel.activeLock.release(); + if (self.channel && self.channel.activeLock) { + self.channel.activeLock.release(); + } else { + Logger.errlog.log("Attempted release of channel lock after " + + "channel was already unloaded in queueStandard: " + + channelName + " " + data.type + ":" + data.id); + } }); }); }