cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 16:39:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor merge fixups

Browse Source
This commit is contained in:
Jordan Brown
2018-09-24 22:37:35 -04:00
parent 082c07ce42
commit c52b528a42
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host.Watchdog/Watchdog.cs
+4 -4
View File
@@ -69,13 +69,13 @@ namespace Tgstation.Server.Host.Watchdog
}
logger.LogInformation("Detected dotnet executable at {0}", dotnetPath);
var rootLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var rootLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var assemblyStoragePath = Path.Combine(rootLocation, "lib"); //always always next to watchdog
var assemblyStoragePath = Path.Combine(rootLocation, "lib"); //always always next to watchdog
#if DEBUG
Directory.CreateDirectory(assemblyStoragePath);
Directory.CreateDirectory(assemblyStoragePath);
#endif
var defaultAssemblyPath = Path.GetFullPath(Path.Combine(assemblyStoragePath, "Default"));
var defaultAssemblyPath = Path.GetFullPath(Path.Combine(assemblyStoragePath, "Default"));
#if DEBUG
//just copy the shit where it belongs
Directory.Delete(assemblyStoragePath, true);
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+1 -1
View File
@@ -663,7 +663,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
throw new InvalidOperationException("Entered LaunchNoLock with one or more of the servers not being null!");
var reattachInfo = await reattachInfoTask.ConfigureAwait(false);
var doesntNeedNewDmb = doReattach && reattachInfo.Alpha != null && reattachInfo.Bravo != null;
var doesntNeedNewDmb = doReattach && reattachInfo?.Alpha != null && reattachInfo?.Bravo != null;
var dmbToUse = doesntNeedNewDmb ? null : dmbFactory.LockNextDmb(2);
try