Detect client even if clientType is set

Simple-Tracker · Jul 19, 2024 · 7e14f7f · 7e14f7f
1 parent 203e75d
commit 7e14f7f
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/client.go b/client.go
@@ -32,26 +32,32 @@ func SetURLFromClient() {
 	}
 }
 func DetectClient() bool {
-	if config.ClientType != "" {
-		currentClientType = config.ClientType
-		return true
-	}
-
 	currentClientType = "qBittorrent"
-	if qB_GetAPIVersion() {
-		Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
-		return true
+	if config.ClientType == "" || config.ClientType == currentClientType {
+		if qB_GetAPIVersion() {
+			Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
+			return true
+		}
 	}
 
 	currentClientType = "Transmission"
-	if Tr_DetectVersion() {
-		Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
-		return true
+	if config.ClientType == "" || config.ClientType == currentClientType {
+		if Tr_DetectVersion() {
+			Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
+			return true
+		}
 	}
 
 	currentClientType = "BitComet"
-	if BC_DetectClient() {
-		Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
+	if config.ClientType == "" || config.ClientType == currentClientType {
+		if BC_DetectClient() {
+			Log("DetectClient", GetLangText("Success-DetectClient"), true, currentClientType)
+			return true
+		}
+	}
+
+	if config.ClientType != "" {
+		currentClientType = config.ClientType
 		return true
 	}