moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' of github.com:calzoneman/sync into 3.0

This commit is contained in:
calzoneman 2014-03-04 16:22:29 -06:00
parent b225e9ef50 f992d625fb
commit 690ea9dbde
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/channel.js
View File

@ -1901,7 +1901,7 @@ Channel.prototype.deleteMedia = function (uid, callback) {
*/ */
Channel.prototype.setTemp = function (uid, temp) { Channel.prototype.setTemp = function (uid, temp) {
var item = this.playlist.items.find(uid); var item = this.playlist.items.find(uid);
if (item == null) { if (item === false) {
return; return;
} }

2
lib/server.js
View File

@ -158,6 +158,8 @@ Server.prototype.unloadChannel = function (chan) {
chan.saveState(); chan.saveState();
} }
chan.logger.log("[init] Channel shutting down");
chan.playlist.die(); chan.playlist.die();
chan.logger.close(); chan.logger.close();
for (var i = 0; i < this.channels.length; i++) { for (var i = 0; i < this.channels.length; i++) {