From 0eafee2a95b609948eb62350e4a9f6800f49b3fd Mon Sep 17 00:00:00 2001 From: Lyubo Marinov Date: Mon, 4 Dec 2017 16:01:28 -0600 Subject: [PATCH] feat(errors): fix error handling for connection and conference --- react/features/base/conference/reducer.js | 3 ++- react/features/base/connection/reducer.js | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/react/features/base/conference/reducer.js b/react/features/base/conference/reducer.js index 844c11ae8..1b8604dd7 100644 --- a/react/features/base/conference/reducer.js +++ b/react/features/base/conference/reducer.js @@ -82,7 +82,8 @@ ReducerRegistry.register('features/base/conference', (state = {}, action) => { * reduction of the specified action. */ 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; if (conference_ && conference_ !== conference) { diff --git a/react/features/base/connection/reducer.js b/react/features/base/connection/reducer.js index d7ec6d0b1..b19cd7b4c 100644 --- a/react/features/base/connection/reducer.js +++ b/react/features/base/connection/reducer.js @@ -97,8 +97,10 @@ function _connectionFailed( error: Object | string }) { - // The active or in-progress connection. - const connection_ = state.connecting || state.connection; + // The current (similar to getCurrentConference in + // base/conference/functions.js) connection which is connecting or + // connected: + const connection_ = state.connection || state.connecting; if (connection_ && connection_ !== connection) { return state;