]> Nutra Git (v2) - gamesguru/feather.git/commitdiff
Revert "TorManager: TOR_INSTALLED, set fallback tor dir"
authortobtoht <tob@featherwallet.org>
Wed, 24 May 2023 19:53:28 +0000 (21:53 +0200)
committertobtoht <tob@featherwallet.org>
Wed, 24 May 2023 19:53:28 +0000 (21:53 +0200)
This reverts commit fce3b0338854b6e488cf4406eb5c6f6e75c55a2d.

src/utils/TorManager.cpp

index c3e0dacf4758e32285873cd2ee183d25065aa53d..21d6b8f3dff64d0a82ce82bad8f3e720ac2bd12b 100644 (file)
@@ -21,15 +21,9 @@ TorManager::TorManager(QObject *parent)
     connect(m_checkConnectionTimer, &QTimer::timeout, this, &TorManager::checkConnection);
 
     this->torDir = Config::defaultConfigDir().filePath("tor");
-
 #if defined(TOR_INSTALLED)
-    QString installedTorPath = QDir(Utils::applicationPath()).filePath("tor");
-    bool installedTorPathIsDir = QFileInfo(torPath).isDir();
-    if (installedTorPathIsDir) {
-        this->torDir = installedTorPath;
-    } else {
-        this->torDir = Utils::applicationPath();
-    }
+    // When installed, use directory relative to application path.
+    this->torDir = QDir(Utils::applicationPath()).filePath("tor");
 #endif
 
     this->torDataPath = Config::defaultConfigDir().filePath("tor/data");