diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2019-06-23 21:38:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 21:38:30 +0200 |
| commit | 44a7c5867b4172034e76bfb678c66c3bf7d81507 (patch) | |
| tree | 428b56ea59d1e3e450fabd4c63fafc80e99d0ab9 /application/pages | |
| parent | 75ddbc8851c8227baad4e2f1d120785090d5e992 (diff) | |
| parent | 77f3f028fa36c6712d11c6fd455394cfe03a8f88 (diff) | |
| download | MultiMC-44a7c5867b4172034e76bfb678c66c3bf7d81507.tar MultiMC-44a7c5867b4172034e76bfb678c66c3bf7d81507.tar.gz MultiMC-44a7c5867b4172034e76bfb678c66c3bf7d81507.tar.lz MultiMC-44a7c5867b4172034e76bfb678c66c3bf7d81507.tar.xz MultiMC-44a7c5867b4172034e76bfb678c66c3bf7d81507.zip | |
Merge pull request #2703 from Janrupf/feature/apply_proxy_settings
GH-2499 Apply proxy settings immediately
Diffstat (limited to 'application/pages')
| -rw-r--r-- | application/pages/global/ProxyPage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/application/pages/global/ProxyPage.cpp b/application/pages/global/ProxyPage.cpp index 5c53fb52..ee56a54e 100644 --- a/application/pages/global/ProxyPage.cpp +++ b/application/pages/global/ProxyPage.cpp @@ -20,6 +20,7 @@ #include "settings/SettingsObject.h" #include "MultiMC.h" +#include "Env.h" ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage) { @@ -75,6 +76,9 @@ void ProxyPage::applySettings() s->set("ProxyPort", ui->proxyPortEdit->value()); s->set("ProxyUser", ui->proxyUserEdit->text()); s->set("ProxyPass", ui->proxyPassEdit->text()); + + ENV.updateProxySettings(proxyType, ui->proxyAddrEdit->text(), ui->proxyPortEdit->value(), + ui->proxyUserEdit->text(), ui->proxyPassEdit->text()); } void ProxyPage::loadSettings() { |