Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #142 - proxy settings not loaded #144

Merged
merged 2 commits into from
Aug 25, 2014
Merged

fix #142 - proxy settings not loaded #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b731a8
fix #142 - proxy settings not loaded
digital-dreamer Aug 2, 2014
c281ddc
clarify button texts in Czech localization
digital-dreamer Aug 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/qt/locale/bitcoin_cs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ a po ní zařadí do fronty transakci name_firstupdate.</translation>
<message>
<location line="+71"/>
<source>&amp;OK</source>
<translation>&amp;Budiž</translation>
<translation>&amp;OK</translation>
</message>
<message>
<location line="+7"/>
Expand All @@ -1448,7 +1448,7 @@ a po ní zařadí do fronty transakci name_firstupdate.</translation>
<message>
<location line="+10"/>
<source>&amp;Apply</source>
<translation>&amp;Uložit</translation>
<translation>&amp;Použít</translation>
</message>
<message>
<location filename="../optionsdialog.cpp" line="+53"/>
Expand Down
2 changes: 2 additions & 0 deletions src/qt/optionsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ bool static ApplyProxySettings()
if (!settings.value("fUseProxy", false).toBool()) {
addrProxy = CService();
nSocksVersion = 0;
SetProxy(NET_IPV4, addrProxy, nSocksVersion);
return false;
}
if (nSocksVersion && !addrProxy.IsValid())
Expand Down Expand Up @@ -70,6 +71,7 @@ void OptionsModel::Init()
SoftSetArg("-socks", settings.value("nSocksVersion").toString().toStdString());
if (!language.isEmpty())
SoftSetArg("-lang", language.toStdString());
ApplyProxySettings();
}

void OptionsModel::Reset()
Expand Down