PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Copy native DLLs if newer

Browse Source
This commit is contained in:
John Gross
2019-06-24 19:47:08 -07:00
parent 13f5648963
commit ecbbd6fbf2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Torch.Server/Initializer.cs
View File

@@ -63,13 +63,13 @@ quit";
var apiSource = Path.Combine(basePath, "DedicatedServer64", "steam_api64.dll"); var apiSource = Path.Combine(basePath, "DedicatedServer64", "steam_api64.dll");
var apiTarget = Path.Combine(basePath, "steam_api64.dll"); var apiTarget = Path.Combine(basePath, "steam_api64.dll");
if (!File.Exists(apiTarget)) if (!File.Exists(apiTarget) || File.GetLastWriteTime(apiTarget) < File.GetLastWriteTime(apiSource))
File.Copy(apiSource, apiTarget); File.Copy(apiSource, apiTarget);
var havokSource = Path.Combine(basePath, "DedicatedServer64", "Havok.dll"); var havokSource = Path.Combine(basePath, "DedicatedServer64", "Havok.dll");
var havokTarget = Path.Combine(basePath, "Havok.dll"); var havokTarget = Path.Combine(basePath, "Havok.dll");
if (!File.Exists(havokTarget)) if (!File.Exists(havokTarget) || File.GetLastWriteTime(havokTarget) < File.GetLastWriteTime(havokSource))
File.Copy(havokSource, havokTarget); File.Copy(havokSource, havokTarget);
_config = InitConfig(); _config = InitConfig();

7
Torch.Server/Program.cs
View File

@@ -35,7 +35,6 @@ namespace Torch.Server
var badDlls = new[] var badDlls = new[]
{ {
"System.Security.Principal.Windows.dll", "System.Security.Principal.Windows.dll",
"steam_api64.dll"
}; };
try try
@@ -46,9 +45,11 @@ namespace Torch.Server
File.Delete(file); File.Delete(file);
} }
} }
catch catch (Exception e)
{ {
LogManager.GetCurrentClassLogger().Error($"Error updating. Please delete the following files from the Torch root folder manually:\r\n{string.Join("\r\n", badDlls)}"); var log = LogManager.GetCurrentClassLogger();
log.Error($"Error updating. Please delete the following files from the Torch root folder manually:\r\n{string.Join("\r\n", badDlls)}");
log.Error(e);
return; return;
} }