mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 13:47:26 +02:00
Code Issues Releases Wiki Activity

Revert Check for changed() when updating proxy settings

Browse Source
This commit is contained in:
Hugo Lindström
2012-09-28 15:39:22 +02:00
parent e1441ae497
commit 7e8154189b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SettingsDialog.cpp
View File

@@ -270,6 +270,9 @@ SettingsDialog::saveSettings()
s->applyChanges(); s->applyChanges();
s->sync(); s->sync();
if ( m_restartRequired )
QMessageBox::information( 0, tr( "Information" ), tr( "Some changed settings will not take effect until Tomahawk is restarted" ) );
TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory(); TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory();
if ( !m_advancedWidgetUi->enableProxyCheckBox->isChecked() ) if ( !m_advancedWidgetUi->enableProxyCheckBox->isChecked() )
{ {
@@ -288,8 +291,6 @@ SettingsDialog::saveSettings()
} }
} }
if ( m_restartRequired || proxyFactory->changed() )
QMessageBox::information( 0, tr( "Information" ), tr( "Some changed settings will not take effect until Tomahawk is restarted" ) );
} }
@@ -364,7 +365,6 @@ void
SettingsDialog::toggleProxyEnabled() SettingsDialog::toggleProxyEnabled()
{ {
m_advancedWidgetUi->proxyButton->setEnabled( m_advancedWidgetUi->enableProxyCheckBox->isChecked() ); m_advancedWidgetUi->proxyButton->setEnabled( m_advancedWidgetUi->enableProxyCheckBox->isChecked() );
m_restartRequired = (TomahawkSettings::instance()->proxyType() == QNetworkProxy::Socks5Proxy) != m_advancedWidgetUi->proxyButton->isEnabled();
} }