diff --git a/main.go b/main.go index dc539239..f1352df5 100644 --- a/main.go +++ b/main.go @@ -193,15 +193,18 @@ func loadACN() { torpath := "tor" if runtime.GOOS == "android" { torpath = path.Join(androidBaseDir, "lib/libtor.so") + } else if runtime.GOOS == "windows" { + ex, err := os.Executable() + if err != nil { + ex = "" + } + exPath := filepath.Dir(ex) + torpath = path.Join(exPath, "tor-0.3.5.7", "Tor", "tor.exe") } else { dir, _ := filepath.Abs(filepath.Dir(os.Args[0])) if _, err := os.Stat(path.Join(dir, "tor")); os.IsNotExist(err) { if _, err := os.Stat(path.Join(dir, "deploy", "linux", "tor")); os.IsNotExist(err) { - if _, err := os.Stat(path.Join(dir, "deploy", "windows", "tor")); os.IsNotExist(err) { - log.Warnln("Cannot find bundled Tor") - } else { - torpath = path.Join(dir, "deploy", "windows", "tor") - } + log.Warnln("Cannot find bundled Tor") } else { torpath = path.Join(dir, "deploy", "linux", "tor") }