Переглянути джерело

feat(errors): fix error handling for connection and conference

master
Lyubo Marinov 7 роки тому
джерело
коміт
0eafee2a95

+ 2
- 1
react/features/base/conference/reducer.js Переглянути файл

@@ -82,7 +82,8 @@ ReducerRegistry.register('features/base/conference', (state = {}, action) => {
82 82
  * reduction of the specified action.
83 83
  */
84 84
 function _conferenceFailed(state, { conference, error }) {
85
-    // The active conference or the one we are joining.
85
+    // The current (similar to getCurrentConference in
86
+    // base/conference/functions.js) conference which is joining or joined:
86 87
     const conference_ = state.conference || state.joining;
87 88
 
88 89
     if (conference_ && conference_ !== conference) {

+ 4
- 2
react/features/base/connection/reducer.js Переглянути файл

@@ -97,8 +97,10 @@ function _connectionFailed(
97 97
             error: Object | string
98 98
         }) {
99 99
 
100
-    // The active or in-progress connection.
101
-    const connection_ = state.connecting || state.connection;
100
+    // The current (similar to getCurrentConference in
101
+    // base/conference/functions.js) connection which is connecting or
102
+    // connected:
103
+    const connection_ = state.connection || state.connecting;
102 104
 
103 105
     if (connection_ && connection_ !== connection) {
104 106
         return state;

Завантаження…
Відмінити
Зберегти