aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Channels
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-29 22:47:20 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-29 22:47:20 -0400
commit32abd342e19437021c01a43ec3df701ef1b213ea (patch)
tree1df4070e69ac80bb66b2c6d57942926d7914c245 /MediaBrowser.Server.Implementations/Channels
parentd174f641836eea232885a45dec86ab0a9f3c9f4b (diff)
parentcb994c3e7abbc49e661b8704e4bdf31a68e6e694 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Channels')
-rw-r--r--MediaBrowser.Server.Implementations/Channels/ChannelManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index 41592865c..bb7e142b6 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -657,7 +657,7 @@ namespace MediaBrowser.Server.Implementations.Channels
_logger.ErrorException("Error getting all media from {0}", ex, i.Name);
}
}
- return new Tuple<IChannel, ChannelItemResult>(i, new ChannelItemResult { });
+ return new Tuple<IChannel, ChannelItemResult>(i, new ChannelItemResult());
});
var results = await Task.WhenAll(tasks).ConfigureAwait(false);
@@ -811,7 +811,7 @@ namespace MediaBrowser.Server.Implementations.Channels
_logger.ErrorException("Error getting all media from {0}", ex, i.Name);
}
}
- return new Tuple<IChannel, ChannelItemResult>(i, new ChannelItemResult { });
+ return new Tuple<IChannel, ChannelItemResult>(i, new ChannelItemResult());
});
var results = await Task.WhenAll(tasks).ConfigureAwait(false);