1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 58aa5a2ce7..8b27f83cc2 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -73,17 +73,16 @@ if not exist "!RABBITMQ_BASE!" (
 for /f "delims=" %%F in ("!RABBITMQ_BASE!") do set RABBITMQ_BASE=%%~sF
 
 REM Check for the short names here too
-if "!RABBITMQ_USE_LONGNAME!"=="" (
-    if "!USE_LONGNAME!"=="" (
-        set RABBITMQ_NAME_TYPE="-sname"
-        set NAMETYPE=shortnames
-    )
-)
-
 if "!RABBITMQ_USE_LONGNAME!"=="true" (
+    set RABBITMQ_NAME_TYPE="-name"
+    set NAMETYPE=longnames
+) else (
     if "!USE_LONGNAME!"=="true" (
         set RABBITMQ_NAME_TYPE="-name"
         set NAMETYPE=longnames
+    ) else (
+        set RABBITMQ_NAME_TYPE="-sname"
+        set NAMETYPE=shortnames
     )
 )