From 15e1633d8643caf1be2cea34f70050572a284593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Domas?= <pawel.domas@jitsi.org>
Date: Thu, 22 Mar 2018 10:57:08 -0500
Subject: [PATCH] fix(config): no legacy over non-legacy override (#2644)

Do not take legacy property into account if there's non-legacy value.
---
 react/features/base/config/reducer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/features/base/config/reducer.js b/react/features/base/config/reducer.js
index f638d130c..eceb94247 100644
--- a/react/features/base/config/reducer.js
+++ b/react/features/base/config/reducer.js
@@ -157,7 +157,7 @@ function _translateLegacyConfig(oldValue: Object) {
 
     /* eslint-enable indent */
 
-        if (oldKey in newValue) {
+        if (oldKey in newValue && !(newKey in newValue.p2p)) {
             const v = newValue[oldKey];
 
             // Do not modify oldValue.