diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-01-22 08:55:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-01-22 08:55:57 +0100 |
| commit | 2f06b5965ae564dea4d13b5c0ec79cfb58d2c74a (patch) | |
| tree | 9fd7b784bc974a3b8988a28ad35c7cf8e9ea1b91 /src/qt/optionsdialog.cpp | |
| parent | Merge pull request #3521 (diff) | |
| parent | [Qt] let OptionsModel::getProxySettings() directly query proxy (diff) | |
| download | discoin-2f06b5965ae564dea4d13b5c0ec79cfb58d2c74a.tar.xz discoin-2f06b5965ae564dea4d13b5c0ec79cfb58d2c74a.zip | |
Merge pull request #3452
1ba3560 [Qt] let OptionsModel::getProxySettings() directly query proxy (Philip Kaufmann)
Diffstat (limited to 'src/qt/optionsdialog.cpp')
| -rw-r--r-- | src/qt/optionsdialog.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index d024e3b7a..f61bb3ed2 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -53,7 +53,6 @@ OptionsDialog::OptionsDialog(QWidget *parent) : connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyIp, SLOT(setEnabled(bool))); connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyPort, SLOT(setEnabled(bool))); connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->socksVersion, SLOT(setEnabled(bool))); - connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning_Proxy())); ui->proxyIp->installEventFilter(this); @@ -204,7 +203,7 @@ void OptionsDialog::on_resetButton_clicked() if(btnRetVal == QMessageBox::Cancel) return; - /* reset all options and close Bitcoin-Qt */ + /* reset all options and close GUI */ model->Reset(); QApplication::quit(); } |