Don't lose proxy settings when changing passwords

This commit is contained in:
Daniel Molkentin 2013-06-14 12:35:14 +02:00
parent b87b0e16e6
commit 60f1c65a48

View file

@ -235,10 +235,8 @@ void OwncloudSetupWizard::testOwnCloudConnect()
// If there is already a config, take its proxy config. // If there is already a config, take its proxy config.
if( ownCloudInfo::instance()->isConfigured() ) { if( ownCloudInfo::instance()->isConfigured() ) {
MirallConfigFile prevCfg; MirallConfigFile prevCfg;
if( prevCfg.proxyType() != QNetworkProxy::DefaultProxy ) { cfgFile.setProxyType( prevCfg.proxyType(), prevCfg.proxyHostName(), prevCfg.proxyPort(),
cfgFile.setProxyType( prevCfg.proxyType(), prevCfg.proxyHostName(), prevCfg.proxyPort(), prevCfg.proxyNeedsAuth(), prevCfg.proxyUser(), prevCfg.proxyPassword() );
prevCfg.proxyNeedsAuth(), prevCfg.proxyUser(), prevCfg.proxyPassword() );
}
} }
// now start ownCloudInfo to check the connection. // now start ownCloudInfo to check the connection.