浏览代码

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

master
Bettenbuk Zoltan 6 年前
父节点
当前提交
8f0a12016a
共有 1 个文件被更改,包括 7 次插入5 次删除
  1. 7
    5
      react/features/base/conference/functions.js

+ 7
- 5
react/features/base/conference/functions.js 查看文件

@@ -178,13 +178,15 @@ export function getConferenceName(stateful: Function | Object): string {
178 178
  * @returns {JitsiConference|undefined}
179 179
  */
180 180
 export function getCurrentConference(stateful: Function | Object) {
181
-    const { conference, joining, leaving }
181
+    const { conference, joining, leaving, passwordRequired }
182 182
         = toState(stateful)['features/base/conference'];
183 183
 
184
-    return (
185
-        conference
186
-            ? conference === leaving ? undefined : conference
187
-            : joining);
184
+    // There is a precendence
185
+    if (conference) {
186
+        return conference === leaving ? undefined : conference;
187
+    }
188
+
189
+    return joining || passwordRequired;
188 190
 }
189 191
 
190 192
 /**

正在加载...
取消
保存