|
|
@@ -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
|
/**
|