From 906b1d51a317ce624051678b6386b2d7f2998283 Mon Sep 17 00:00:00 2001
From: RPRX <63339210+RPRX@users.noreply.github.com>
Date: Fri, 15 Aug 2025 23:18:51 +0000
Subject: [PATCH] Avoid conflict before merging

https://github.com/XTLS/Xray-core/commit/aac0d6a6a500a83df2040e378a1c6df3da58e78b
---
 infra/conf/vless.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/infra/conf/vless.go b/infra/conf/vless.go
index a13b735b..049b1dc8 100644
--- a/infra/conf/vless.go
+++ b/infra/conf/vless.go
@@ -56,15 +56,15 @@ func (c *VLessInboundConfig) Build() (proto.Message, error) {
 		account.Id = u.String()
 
 		switch account.Flow {
-		case "":
-		case vless.XRV:
-			if c.Decryption != "none" {
-				return nil, errors.New(`VLESS clients: "decryption" doesn't support "flow" yet`)
-			}
+		case "", vless.XRV:
 		default:
 			return nil, errors.New(`VLESS clients: "flow" doesn't support "` + account.Flow + `" in this version`)
 		}
 
+		if c.Decryption != "none" && account.Flow == vless.XRV {
+			return nil, errors.New(`VLESS clients: "decryption" doesn't support "flow" yet`)
+		}
+
 		if account.Encryption != "" {
 			return nil, errors.New(`VLESS clients: "encryption" should not in inbound settings`)
 		}