Merge branch 'master' of belledonne-communications.com:linphone-private into dev_sal

[linphone] / coreapi / proxy.c

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 01b96bd78977e40eb9ef506bb6d7511806298c49..ad59c06f86fd5b687b3ec6ac32054ac5fbc58553 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -634,11 +634,13 @@ SipSetup *linphone_proxy_config_get_sip_setup(LinphoneProxyConfig *cfg){
 }
 
 void linphone_proxy_config_update(LinphoneProxyConfig *cfg){
+       LinphoneCore *lc=cfg->lc;
        if (cfg->commit){
                if (cfg->type && cfg->ssctx==NULL){
                        linphone_proxy_config_activate_sip_setup(cfg);
                }
-               linphone_proxy_config_register(cfg);
+               if (lc->sip_conf.register_only_when_network_is_up || lc->network_reachable)
+                       linphone_proxy_config_register(cfg);
                cfg->commit=FALSE;
        }
 }