From b8047a5585b8c6e737d02080c7bfddf4c9ed802c Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Sun, 31 May 2020 12:09:13 -0400
Subject: [PATCH] Don't consider startup timeout as a launch parameter

---
 build/Version.props                                          | 4 ++--
 .../Models/Internal/DreamDaemonLaunchParameters.cs           | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index bda24b2315..a59e37402d 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,8 +3,8 @@
     <!-- This is the authorative version list -->
     <!-- Integration tests will ensure they match across the board -->
     <TgsCoreVersion>4.3.0</TgsCoreVersion>
-    <TgsApiVersion>6.5.0</TgsApiVersion>
-    <TgsClientVersion>7.1.0</TgsClientVersion>
+    <TgsApiVersion>6.5.1</TgsApiVersion>
+    <TgsClientVersion>7.1.1</TgsClientVersion>
     <TgsDmapiVersion>5.2.2</TgsDmapiVersion>
     <TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
     <TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>
diff --git a/src/Tgstation.Server.Api/Models/Internal/DreamDaemonLaunchParameters.cs b/src/Tgstation.Server.Api/Models/Internal/DreamDaemonLaunchParameters.cs
index f5bd309d61..647c22c6db 100644
--- a/src/Tgstation.Server.Api/Models/Internal/DreamDaemonLaunchParameters.cs
+++ b/src/Tgstation.Server.Api/Models/Internal/DreamDaemonLaunchParameters.cs
@@ -48,7 +48,7 @@ namespace Tgstation.Server.Api.Models.Internal
 		public uint? HeartbeatSeconds { get; set; }
 
 		/// <summary>
-		/// Check if we match a given set of <paramref name="otherParameters"/>
+		/// Check if we match a given set of <paramref name="otherParameters"/>. <see cref="StartupTimeout"/> is excluded.
 		/// </summary>
 		/// <param name="otherParameters">The <see cref="DreamDaemonLaunchParameters"/> to compare against</param>
 		/// <returns><see langword="true"/> if they match, <see langword="false"/> otherwise</returns>
@@ -57,7 +57,6 @@ namespace Tgstation.Server.Api.Models.Internal
 				&& SecurityLevel == otherParameters.SecurityLevel
 				&& PrimaryPort == otherParameters.PrimaryPort
 				&& SecondaryPort == otherParameters.SecondaryPort
-				&& StartupTimeout == otherParameters.StartupTimeout
-				&& HeartbeatSeconds == otherParameters.HeartbeatSeconds;
+				&& HeartbeatSeconds == otherParameters.HeartbeatSeconds; // We intentionally don't check StartupTimeout as it doesn't matter
 	}
 }
\ No newline at end of file