ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: Injector entrypoint not setting workingdirectory, should be fixed in XL

Browse source
This commit is contained in:
goat 2021-08-20 02:18:15 +02:00
parent 552be3c9a9
commit 080a71ba61
No known key found for this signature in database
GPG key ID: F18F057873895461
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud.Injector/EntryPoint.cs
View file

@ -61,6 +61,9 @@ namespace Dalamud.Injector
var process = GetProcess(args.ElementAtOrDefault(1)); var process = GetProcess(args.ElementAtOrDefault(1));
var startInfo = GetStartInfo(args.ElementAtOrDefault(2), process); var startInfo = GetStartInfo(args.ElementAtOrDefault(2), process);
// TODO: XL does not set this!!! we need to keep this line here for now, otherwise we crash in the Dalamud entrypoint
startInfo.WorkingDirectory = Directory.GetCurrentDirectory();
// This seems to help with the STATUS_INTERNAL_ERROR condition // This seems to help with the STATUS_INTERNAL_ERROR condition
Thread.Sleep(1000); Thread.Sleep(1000);
@ -243,7 +246,7 @@ namespace Dalamud.Injector
startInfo = new DalamudStartInfo startInfo = new DalamudStartInfo
{ {
WorkingDirectory = Directory.GetCurrentDirectory(), WorkingDirectory = null,
ConfigurationPath = Path.Combine(xivlauncherDir, "dalamudConfig.json"), ConfigurationPath = Path.Combine(xivlauncherDir, "dalamudConfig.json"),
PluginDirectory = Path.Combine(xivlauncherDir, "installedPlugins"), PluginDirectory = Path.Combine(xivlauncherDir, "installedPlugins"),
DefaultPluginDirectory = Path.Combine(xivlauncherDir, "devPlugins"), DefaultPluginDirectory = Path.Combine(xivlauncherDir, "devPlugins"),

2
Dalamud/DalamudStartInfo.cs
View file

@ -14,7 +14,7 @@ namespace Dalamud
/// <summary> /// <summary>
/// Gets the working directory of the XIVLauncher installations. /// Gets the working directory of the XIVLauncher installations.
/// </summary> /// </summary>
public string WorkingDirectory { get; init; } public string WorkingDirectory { get; set; }
/// <summary> /// <summary>
/// Gets the path to the configuration file. /// Gets the path to the configuration file.