Skip to content
Permalink
Browse files

Merge pull request #2703 from Janrupf/feature/apply_proxy_settings

GH-2499 Apply proxy settings immediately
  • Loading branch information...
peterix committed Jun 23, 2019
2 parents 75ddbc8 + 77f3f02 commit 44a7c5867b4172034e76bfb678c66c3bf7d81507
Showing with 4 additions and 0 deletions.
  1. +4 −0 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()
{

0 comments on commit 44a7c58

Please sign in to comment.
You can’t perform that action at this time.