Merge pull request #685 from tsareg/fix_type_error_when_enabling_permissions_for_devices

Fix TypeError when one of audioTracks or videoTracks was undefined
2016-06-09 09:37:02 -05:00 · 2016-06-09 09:37:02 -05:00 · 9dcb717a51
parent 61fa2d8ed1 f72e3bf552
commit 9dcb717a51
1 changed files with 2 additions and 1 deletions
--- a/conference.js
+++ b/conference.js
@ -594,7 +594,8 @@ export default {
                                            videoTrackCreationError);
                                    }

-                                    return audioTracks.concat(videoTracks);
+                                    return (audioTracks || [])
+                                        .concat(videoTracks || []);
                                });
                        } else {
                            promise = createAudioTrack();