haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: return room lock conference, when there is no other

This commit is contained in:
Bettenbuk Zoltan 2019-11-20 11:57:18 +01:00 committed by Zoltan Bettenbuk
parent 34ccd3524f
commit 8f0a12016a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
react/features/base/conference/functions.js
View File

@ -178,13 +178,15 @@ export function getConferenceName(stateful: Function | Object): string {
* @returns {JitsiConference|undefined} * @returns {JitsiConference|undefined}
*/ */
export function getCurrentConference(stateful: Function | Object) { export function getCurrentConference(stateful: Function | Object) {
const { conference, joining, leaving } const { conference, joining, leaving, passwordRequired }
= toState(stateful)['features/base/conference']; = toState(stateful)['features/base/conference'];
return ( // There is a precendence
conference if (conference) {
? conference === leaving ? undefined : conference return conference === leaving ? undefined : conference;
: joining); }
return joining || passwordRequired;
} }
/** /**