Преглед изворни кода

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
  * @returns {JitsiConference|undefined}
178
  * @returns {JitsiConference|undefined}
179
  */
179
  */
180
 export function getCurrentConference(stateful: Function | Object) {
180
 export function getCurrentConference(stateful: Function | Object) {
181
-    const { conference, joining, leaving }
181
+    const { conference, joining, leaving, passwordRequired }
182
         = toState(stateful)['features/base/conference'];
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
 /**

Loading…
Откажи
Сачувај