Merge ddf7de0123 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-20 14:35:54 +00:00 · 2026-01-13 17:41:23 +01:00 · 2026-01-13 17:40:52 +01:00 · 2026-01-08 06:06:41 +03:00
2 changed files with 5 additions and 2 deletions
--- a/web/service/xray.go
+++ b/web/service/xray.go
@ -40,6 +40,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
--- a/x-ui.sh
+++ b/x-ui.sh
@ -229,9 +229,9 @@ reset_user() {

    read -rp "Do you want to disable currently configured two-factor authentication? (y/n): " twoFactorConfirm
    if [[ $twoFactorConfirm != "y" && $twoFactorConfirm != "Y" ]]; then
-        ${xui_folder}/x-ui setting -username ${config_account} -password ${config_password} -resetTwoFactor false >/dev/null 2>&1
+        ${xui_folder}/x-ui setting -username "${config_account}" -password "${config_password}" -resetTwoFactor false >/dev/null 2>&1
    else
-        ${xui_folder}/x-ui setting -username ${config_account} -password ${config_password} -resetTwoFactor true >/dev/null 2>&1
+        ${xui_folder}/x-ui setting -username "${config_account}" -password "${config_password}" -resetTwoFactor true >/dev/null 2>&1
        echo -e "Two factor authentication has been disabled."
    fi
Author	SHA1	Message	Date
Vorontsov Amadey	8b981d55f1	Merge `ddf7de0123` into `8098d2b1b1`	2026-01-13 17:41:23 +01: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
Amadey Vorontsov	ddf7de0123	Feature: Use of username and passwords consisting of several words	2026-01-08 06:06:41 +03:00