mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-23 17:56:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't apply some settings again if they weren't changed. Closes #4278.

Browse source
This commit is contained in:
sledgehammer999 2015-12-13 16:41:58 +02:00
parent 2d25edd4d6
commit 82e02f7118
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/gui/mainwindow.cpp
View file

@ -104,6 +104,7 @@ MainWindow::MainWindow(QWidget *parent)
, m_posInitialized(false)
, force_exit(false)
, unlockDlgShowing(false)
, m_wasUpdateCheckEnabled(false)
, has_python(false)
{
setupUi(this);
@ -337,6 +338,8 @@ MainWindow::MainWindow(QWidget *parent)
connect(transferList->getSourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
connect(transferList->getSourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(updateNbTorrents()));
connect(pref, SIGNAL(changed()), this, SLOT(optionsSaved()));
qDebug("GUI Built");
#ifdef Q_OS_WIN
if (!pref->neverCheckFileAssoc() && (!Preferences::isTorrentFileAssocSet() || !Preferences::isMagnetLinkAssocSet())) {
@ -1108,7 +1111,7 @@ void MainWindow::loadPreferences(bool configure_session)
toolBar->setVisible(false);
}
if (pref->preventFromSuspend()) {
if (pref->preventFromSuspend() && !preventTimer->isActive()) {
preventTimer->start(PREVENT_SUSPEND_INTERVAL);
}
else {
@ -1149,10 +1152,14 @@ void MainWindow::loadPreferences(bool configure_session)
properties->reloadPreferences();
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
if (pref->isUpdateCheckEnabled())
if (pref->isUpdateCheckEnabled() && !m_wasUpdateCheckEnabled) {
m_wasUpdateCheckEnabled = true;
checkProgramUpdate();
else
}
else if (!pref->isUpdateCheckEnabled() && m_wasUpdateCheckEnabled) {
m_wasUpdateCheckEnabled = false;
programUpdateTimer.stop();
}
#endif
qDebug("GUI settings loaded");
@ -1336,14 +1343,10 @@ void MainWindow::createTrayIcon()
// Display Program Options
void MainWindow::on_actionOptions_triggered()
{
if (options) {
// Get focus
if (options)
options->setFocus();
}
else {
else
options = new options_imp(this);
connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
}
}
void MainWindow::on_actionTop_tool_bar_triggered()

1
src/gui/mainwindow.h
View file

@ -202,6 +202,7 @@ private:
QTimer *preventTimer;
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
QTimer programUpdateTimer;
bool m_wasUpdateCheckEnabled;
#endif
bool has_python;
QMenu* toolbarMenu;

4
src/gui/options_imp.cpp
View file

@ -1000,10 +1000,9 @@ void options_imp::on_buttonBox_accepted()
tabSelection->setCurrentRow(TAB_SPEED);
return;
}
saveOptions();
applyButton->setEnabled(false);
this->hide();
emit status_changed();
saveOptions();
}
saveWindowState();
accept();
@ -1017,7 +1016,6 @@ void options_imp::applySettings(QAbstractButton* button)
return;
}
saveOptions();
emit status_changed();
}
}

4
src/gui/options_imp.h
View file

@ -70,10 +70,6 @@ public:
public slots:
void showConnectionTab();
signals:
void status_changed() const;
void exitWithCancel();
private slots:
void enableProxy(int comboIndex);
void on_buttonBox_accepted();