neoris/dizquetv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #247 from vexorian/20210121_dev

Browse Source 
Align 1.2.x into 1.3.x
This commit is contained in:
vexorian 2021-01-21 23:58:25 -04:00 committed by GitHub
commit f32a6d1397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/directives/channel-config.js
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();
}