소스 검색

Fixes showing video after waiting for owner. Fixes #3671.

j8
damencho 6 년 전
부모
커밋
4d440f5f64
2개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 4
    1
      conference.js
  2. 2
    1
      react/features/base/conference/actions.js

+ 4
- 1
conference.js 파일 보기

347
         // not enough rights to create conference
347
         // not enough rights to create conference
348
         case JitsiConferenceErrors.AUTHENTICATION_REQUIRED: {
348
         case JitsiConferenceErrors.AUTHENTICATION_REQUIRED: {
349
             // Schedule reconnect to check if someone else created the room.
349
             // Schedule reconnect to check if someone else created the room.
350
-            this.reconnectTimeout = setTimeout(() => room.join(), 5000);
350
+            this.reconnectTimeout = setTimeout(() => {
351
+                APP.store.dispatch(conferenceWillJoin(room));
352
+                room.join();
353
+            }, 5000);
351
 
354
 
352
             const { password }
355
             const { password }
353
                 = APP.store.getState()['features/base/conference'];
356
                 = APP.store.getState()['features/base/conference'];

+ 2
- 1
react/features/base/conference/actions.js 파일 보기

382
  * @returns {Function}
382
  * @returns {Function}
383
  */
383
  */
384
 export function checkIfCanJoin() {
384
 export function checkIfCanJoin() {
385
-    return (dispatch: Dispatch<*>, getState: Function) => {
385
+    return (dispatch: Function, getState: Function) => {
386
         const { authRequired, password }
386
         const { authRequired, password }
387
             = getState()['features/base/conference'];
387
             = getState()['features/base/conference'];
388
 
388
 
389
+        authRequired && dispatch(_conferenceWillJoin(authRequired));
389
         authRequired && authRequired.join(password);
390
         authRequired && authRequired.join(password);
390
     };
391
     };
391
 }
392
 }

Loading…
취소
저장