Merge remote-tracking branch 'origin/master' into develop

2017-11-17 17:48:42 +00:00 · 2017-11-17 17:48:42 +00:00 · 1675737e7d
commit 1675737e7d
parent d222992bef 394e450526
5 changed files with 18 additions and 7 deletions
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@ -92,7 +92,12 @@ const ANALYTICS_SETTINGS = [

 // These settings must be defined in SettingsStore
 const WEBRTC_SETTINGS = [
-    { id: 'webRtcForceTURN' },
+    {
+        id: 'webRtcForceTURN',
+        fn: (val) => {
+            MatrixClientPeg.get().setForceTURN(val);
+        },
+    },
 ];

 // These settings must be defined in SettingsStore