Skip to content

Commit 6d99ada

Browse files
committed
Fix setLectureProperties
1 parent f3ab4ee commit 6d99ada

File tree

1 file changed

+25
-15
lines changed

1 file changed

+25
-15
lines changed

src/notepadhandler.js

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,15 @@ export class NoteScreenConnection {
267267

268268
this.setLectureProperties(
269269
notepadscreenid,
270-
cmd.casttoscreens === true,
271-
cmd.backgroundbw === true,
272-
cmd.showscreennumber === true
270+
cmd.casttoscreens !== undefined
271+
? cmd.casttoscreens === true
272+
: undefined,
273+
cmd.backgroundbw !== undefined
274+
? cmd.backgroundbw === true
275+
: undefined,
276+
cmd.showscreennumber !== undefined
277+
? cmd.showscreennumber === true
278+
: undefined
273279
)
274280

275281
this.updateNoteScreen(notepadscreenid, cmd.scrollheight, 'notepad')
@@ -595,19 +601,23 @@ export class NoteScreenConnection {
595601

596602
setLectureProperties(args, casttoscreens, backgroundbw, showscreennumber) {
597603
// console.log("sNs: lecture:"+args.lectureuuid+":notepad:"+args.notepaduuid);
598-
this.redis.hmset(
599-
'lecture:' + args.lectureuuid,
600-
'casttoscreens',
601-
casttoscreens,
602-
'backgroundbw',
603-
backgroundbw,
604-
'showscreennumber',
605-
showscreennumber,
606-
() => {
607-
// console.log("result sNS",err,res);
604+
const tasks = []
605+
if (casttoscreens !== undefined) {
606+
tasks.push('casttoscreens')
607+
tasks.push(casttoscreens)
608+
}
609+
if (backgroundbw !== undefined) {
610+
tasks.push('backgroundbw')
611+
tasks.push(backgroundbw)
612+
}
613+
if (showscreennumber !== undefined) {
614+
tasks.push('showscreennumber')
615+
tasks.push(showscreennumber)
616+
}
617+
if (tasks.length > 0)
618+
this.redis.hmset('lecture:' + args.lectureuuid, tasks, () => {
608619
this.emitscreenlists(args)
609-
}
610-
)
620+
})
611621
/* this.notepadisscreen = isscreen;
612622
this.notepadscrollheight = scrollheight;
613623
this.casttoscreens = casttoscreens;

0 commit comments

Comments
 (0)