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.

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

fix #142 - proxy settings not loaded #144

Merged
merged 2 commits into from
Aug 25, 2014

Conversation

digital-dreamer
Copy link
Contributor

First problem: ApplyProxySettings() was not called on startup, which made the OptionsModel::data say there is no proxy, even if it is on. This causes the options dialog to show proxy as disabled, and if you then save it, it actually disables it.

Solution: Just call ApplyProxySettings() on init.

Second problem: After I fixed this, I found the opposite issue too. If you have proxy enabled, and you disable it in options, hit OK and then go to option again, you still see it as enabled. This was caused by another bug in ApplyProxySettings(). Function returns false before it can call SetProxy to set it to zero.

Solution: Add the missing call to SetProxy.

I also added a clarification of potentially confusing button text meanings in the Czech localization that I noticed while working on this.

@phelixbtc
Copy link
Contributor

Looks good but unfortunately going through Tor does not work for me neither with nor without this patch.... anybody else?

@phelixbtc
Copy link
Contributor

OK, works (original version did not). ACK

phelixbtc added a commit that referenced this pull request Aug 25, 2014
@phelixbtc phelixbtc merged commit 770dea2 into namecoin:namecoinq Aug 25, 2014
domob1812 pushed a commit to domob1812/namecoin that referenced this pull request Dec 16, 2014
bccaf86 Merge pull request namecoin#150
2a53a47 Merge pull request namecoin#151
5f5a31f Merge pull request namecoin#149
3907277 Merge pull request namecoin#142
a3e0611 Enable tests in x86 travis builds
45da235 x86 builder
8bb0e93 Merge pull request namecoin#155
971fe81 build: fix openssl detection for cross builds
f22d73e Explicitly access %0..%2 as 64-bit so we use the right registers for x32 ABI
e66d4d6 Avoid the stack in assembly and use explicit registers
cf7b2b4 Fix ECDSA message hashes to 32 bytes
056ad31 Really compile with -O3 by default
74ad63a Merge pull request namecoin#146
9000458 Merge pull request namecoin#145
1f46b00 build: fix __builtin_expect detection for clang
aaba2e0 Merge pull request namecoin#136
8a0775c Merge pull request namecoin#144
ee1eaa7 Merge pull request namecoin#141
c88e2b8 Compile with -O3 by default
6558a26 Make the benchmarks print out stats
000bdf6 Rename bench_verify to bench_recovery
7c6fed2 Add a few more additional tests.
992e03b travis: add clang to the test matrix
b43b79a Merge pull request namecoin#143
e06a924 Include time.h header for time().
8d11164 Add some additional tests.
3545627 Merge pull request namecoin#118
6a9901e Merge pull request namecoin#137
376b28b Merge pull request namecoin#128
1728806 Merge pull request namecoin#138
a5759c5 Check return value of malloc
39bd94d Variable time normalize
ad86bdf Merge pull request namecoin#140
54b768c Another redundant secp256k1_fe_normalize
69dcaab Merge pull request #139
1c29f2e Remove redundant secp256k1_fe_normalize from secp256k1_gej_add_ge_var.
2b9388b Remove unused secp256k1_fe_inv_all
f461b76 Allocate precomputation arrays on the heap
b2c9681 Make {mul,sqr}_inner use the same argument order as {mul,sqr}
6793505 Convert YASM code into inline assembly
f048615 Rewrite field assembly to match the C version
3ce74b1 Tweak precomputed table size for G

git-subtree-dir: src/secp256k1
git-subtree-split: bccaf86caa9c44166e5a66600b742c516e03c3f0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants