From 92b63db42e97196841a00aa173224d5fb047b388 Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Sun, 31 May 2020 15:12:24 -0400
Subject: [PATCH] Fix some cancellation token issues with auto update

---
 src/Tgstation.Server.Host/Components/Instance.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Instance.cs b/src/Tgstation.Server.Host/Components/Instance.cs
index 131438aa9c..68d5fdcd77 100644
--- a/src/Tgstation.Server.Host/Components/Instance.cs
+++ b/src/Tgstation.Server.Host/Components/Instance.cs
@@ -234,7 +234,7 @@ namespace Tgstation.Server.Host.Components
 											.AsQueryable()
 											.Where(x => x.CommitSha == startSha && x.Instance.Id == metadata.Id)
 											.Include(x => x.ActiveTestMerges).ThenInclude(x => x.TestMerge)
-											.FirstOrDefaultAsync(cancellationToken);
+											.FirstOrDefaultAsync(jobCancellationToken);
 
 									async Task UpdateRevInfo(string currentHead, bool onOrigin)
 									{
@@ -326,7 +326,7 @@ namespace Tgstation.Server.Host.Components
 									if (hasDbChanges)
 										try
 										{
-											await databaseContext.Save(cancellationToken).ConfigureAwait(false);
+											await databaseContext.Save(jobCancellationToken).ConfigureAwait(false);
 										}
 										catch
 										{
@@ -369,7 +369,7 @@ namespace Tgstation.Server.Host.Components
 							DreamMaker.DeploymentProcess,
 							cancellationToken).ConfigureAwait(false);
 
-						await jobManager.WaitForJobCompletion(compileProcessJob, user, cancellationToken, default).ConfigureAwait(false);
+						await jobManager.WaitForJobCompletion(compileProcessJob, user, default, cancellationToken).ConfigureAwait(false);
 					}
 					catch (OperationCanceledException)
 					{