浏览代码

Fix joining a locked room

master
Lyubo Marinov 7 年前
父节点
当前提交
693b1c392f
共有 1 个文件被更改,包括 14 次插入0 次删除
  1. 14
    0
      react/features/base/conference/reducer.js

+ 14
- 0
react/features/base/conference/reducer.js 查看文件

341
     case conference.join:
341
     case conference.join:
342
         if (state.passwordRequired === conference) {
342
         if (state.passwordRequired === conference) {
343
             return assign(state, {
343
             return assign(state, {
344
+                // XXX 1. The JitsiConference which transitions away from
345
+                // passwordRequired MUST remain in the redux state
346
+                // features/base/conference until it transitions into
347
+                // conference; otherwise, there is a span of time during which
348
+                // the redux state does not even know that there is a
349
+                // JitsiConference whatsoever.
350
+                //
351
+                // 2. The redux action setPassword will attempt to join the
352
+                // JitsiConference so joining is an appropriate transitional
353
+                // redux state.
354
+                //
355
+                // 3. The redux action setPassword will perform the same check
356
+                // before it proceeds with the re-join.
357
+                joining: state.conference ? state.joining : conference,
344
                 locked: LOCKED_REMOTELY,
358
                 locked: LOCKED_REMOTELY,
345
 
359
 
346
                 /**
360
                 /**

正在加载...
取消
保存