ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/goatcorp/Dalamud

Browse source
This commit is contained in:
goaaats 2021-10-18 02:18:42 +02:00
commit e8f395b8cc
No known key found for this signature in database
GPG key ID: F18F057873895461
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud.Injector/Dalamud.Injector.csproj
View file

@ -81,9 +81,9 @@
<ItemGroup> <ItemGroup>
<!-- This prevents us from having to include Dalamud itself as a dependency --> <!-- This prevents us from having to include Dalamud itself as a dependency -->
<!-- If the files move just update the paths here --> <!-- If the files move just update the paths here -->
<Compile Include="..\Dalamud\ClientLanguage.cs" /> <Compile Include="..\Dalamud\ClientLanguage.cs" Link="Included\%(Filename)%(Extension)" />
<Compile Include="..\Dalamud\DalamudStartInfo.cs" /> <Compile Include="..\Dalamud\DalamudStartInfo.cs" Link="Included\%(Filename)%(Extension)" />
<Compile Include="..\Dalamud\Game\GameVersion.cs" /> <Compile Include="..\Dalamud\Game\GameVersion.cs" Link="Included\Game\%(Filename)%(Extension)" />
<Compile Include="..\Dalamud\Game\GameVersionConverter.cs" /> <Compile Include="..\Dalamud\Game\GameVersionConverter.cs" Link="Included\Game\%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Dalamud.Injector/EntryPoint.cs
View file

@ -116,7 +116,7 @@ namespace Dalamud.Injector
var baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
#if DEBUG #if DEBUG
var logPath = Path.Combine(baseDirectory, "injector.log"); var logPath = Path.Combine(baseDirectory, "dalamud.injector.log");
#else #else
var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.injector.log"); var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.injector.log");
#endif #endif

5
Dalamud/Logging/Internal/TaskTracker.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Reflection; using System.Reflection;
@ -106,8 +106,7 @@ namespace Dalamud.Logging.Internal
Log.Information("s_asyncDebuggingEnabled: {0}", debugField.GetValue(null)); Log.Information("s_asyncDebuggingEnabled: {0}", debugField.GetValue(null));
var targetMethod = targetType.GetMethod("AddToActiveTasks", BindingFlags.Static | BindingFlags.NonPublic); var targetMethod = targetType.GetMethod("AddToActiveTasks", BindingFlags.Static | BindingFlags.NonPublic);
var patchMethod = var patchMethod = typeof(TaskTracker).GetMethod(nameof(AddToActiveTasksHook), BindingFlags.NonPublic | BindingFlags.Static);
typeof(TaskTracker).GetMethod("AddToActiveTasksHook", BindingFlags.NonPublic | BindingFlags.Static);
if (targetMethod == null) if (targetMethod == null)
Log.Error("TargetMethod null!"); Log.Error("TargetMethod null!");