Merge branch 'dev/1.2.x' into dev/1.3.x

This commit is contained in:
vexorian 2021-01-21 23:56:46 -04:00
commit 755cf3ada8

View File

@ -88,7 +88,10 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) {
} else {
scope.beforeEditChannelNumber = scope.channel.number
if (typeof(scope.channel.watermark) === 'undefined') {
if (
(typeof(scope.channel.watermark) === 'undefined')
|| (scope.channel.watermark.enabled !== true)
) {
scope.channel.watermark = defaultWatermark();
}