Merge dbff4a8409 into 8098d2b1b1

Return nil if no error in GetXrayErr
Added a check to return nil immediately if p.GetErr() returns nil in GetXrayErr, preventing further error handling when no error is present.
2026-04-22 23:45:50 +00:00 · 2026-01-13 22:44:34 +03:00 · 2026-01-13 17:40:52 +01:00
1 changed files with 3 additions and 0 deletions
--- a/web/service/xray.go
+++ b/web/service/xray.go
@ -44,6 +44,9 @@ func (s *XrayService) GetXrayErr() error {
 	}

 	err := p.GetErr()
+	if err == nil {
+		return nil
+	}

 	if runtime.GOOS == "windows" && err.Error() == "exit status 1" {
 		// exit status 1 on Windows means that Xray process was killed
Author	SHA1	Message	Date
konstpic	01a2f2a72e	Merge `dbff4a8409` into `8098d2b1b1`	2026-01-13 22:44:34 +03:00
MHSanaei	8098d2b1b1	Return nil if no error in GetXrayErr Some checks failed Release 3X-UI / build (386) (push) Has been cancelled Details Release 3X-UI / build (amd64) (push) Has been cancelled Details Release 3X-UI / build (arm64) (push) Has been cancelled Details Release 3X-UI / build (armv5) (push) Has been cancelled Details Release 3X-UI / build (armv6) (push) Has been cancelled Details Release 3X-UI / build (armv7) (push) Has been cancelled Details Release 3X-UI / build (s390x) (push) Has been cancelled Details Release 3X-UI / Build for Windows (push) Has been cancelled Details Added a check to return nil immediately if p.GetErr() returns nil in GetXrayErr, preventing further error handling when no error is present.	2026-01-13 17:40:52 +01:00