Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #766 from erri120/zedit-integration-fix

Browse Source 
Fixed zEditIntegration not finding the correct settings file and profile folder
This commit is contained in:
Timothy Baldridge
2020-04-27 06:50:48 -06:00
committed by GitHub
parent 49bcd6d483 6ef661c6ae
commit 666a0c54bf
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Wabbajack.Lib/zEditIntegration.cs
View File

@ -18,26 +18,26 @@ namespace Wabbajack.Lib
{ {
private readonly Dictionary<AbsolutePath, zEditMerge> _mergesIndexed = new Dictionary<AbsolutePath, zEditMerge>(); private readonly Dictionary<AbsolutePath, zEditMerge> _mergesIndexed = new Dictionary<AbsolutePath, zEditMerge>();
private bool _disabled = true; private readonly bool _disabled = true;
private MO2Compiler _mo2Compiler; private readonly MO2Compiler _mo2Compiler;
public IncludeZEditPatches(MO2Compiler compiler) : base(compiler) public IncludeZEditPatches(MO2Compiler compiler) : base(compiler)
{ {
_mo2Compiler = compiler; _mo2Compiler = compiler;
var zEditPath = FindzEditPath(compiler); var zEditPath = FindzEditPath(compiler);
var havezEdit = zEditPath != default; var found = zEditPath != default;
Utils.Log(havezEdit ? $"Found zEdit at {zEditPath}" : "zEdit not detected, disabling zEdit routines"); Utils.Log(found ? $"Found zEdit at {zEditPath}" : "zEdit not detected, disabling zEdit routines");
if (!havezEdit) if (!found)
{ {
_mergesIndexed = new Dictionary<AbsolutePath, zEditMerge>(); _mergesIndexed = new Dictionary<AbsolutePath, zEditMerge>();
return; return;
} }
_mo2Compiler = (MO2Compiler) compiler; _mo2Compiler = compiler;
var settingsFiles = zEditPath.Combine("profiles").EnumerateFiles(false) var settingsFiles = zEditPath.Parent.Combine("profiles").EnumerateFiles()
.Where(f => f.IsFile) .Where(f => f.IsFile)
.Where(f => f.FileName == Consts.SettingsJson) .Where(f => f.FileName == Consts.SettingsJson)
.Where(f => .Where(f =>