diff options
Diffstat (limited to 'src/main_gui.cpp')
| -rw-r--r-- | src/main_gui.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 5194023..bef8503 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp | |||
| @@ -289,6 +289,11 @@ static void ParseStartupArguments(int argc, char* argv[]) | |||
| 289 | bool fTorMode = arg(argc, argv, "/tor") || arg(argc, argv, "-tor"); | 289 | bool fTorMode = arg(argc, argv, "/tor") || arg(argc, argv, "-tor"); |
| 290 | if (fTorMode) | 290 | if (fTorMode) |
| 291 | { | 291 | { |
| 292 | string socksProxy = argval2(argc, argv, "/socks", "-socks"); | ||
| 293 | if (!socksProxy.empty()) | ||
| 294 | fprintf(stderr, "Warning: /tor takes precedence over /socks=%s\n", | ||
| 295 | socksProxy.c_str()); | ||
| 296 | |||
| 292 | string torProxy = argval2(argc, argv, "/tor", "-tor"); | 297 | string torProxy = argval2(argc, argv, "/tor", "-tor"); |
| 293 | string err; | 298 | string err; |
| 294 | if (!BtfEnableTorProxy(torProxy, err)) | 299 | if (!BtfEnableTorProxy(torProxy, err)) |