haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Lyubo Marinov 2017-12-04 16:01:28 -06:00
parent de0d69a20e
commit 0eafee2a95
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
react/features/base/conference/reducer.js
View File

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

6
react/features/base/connection/reducer.js
View File

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