From 42e585376012c1b589b810a1cff0296d206f2e48 Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Thu, 19 Aug 2021 20:54:56 +0200
Subject: [PATCH] fix c++ build
---
Dalamud.Boot/dllmain.cpp | 4 ++--
Dalamud/Plugin/Internal/PluginManager.cs | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Dalamud.Boot/dllmain.cpp b/Dalamud.Boot/dllmain.cpp
index 7430e4ae6..c930c13a8 100644
--- a/Dalamud.Boot/dllmain.cpp
+++ b/Dalamud.Boot/dllmain.cpp
@@ -50,8 +50,8 @@ LONG WINAPI VectoredHandler(struct _EXCEPTION_POINTERS* ExceptionInfo)
auto actual_address = ex_address - base_address + 0x140000000;
FILE* log_handle;
- errno_t result = _wfopen_s(&log_handle, dalamud_log_path.c_str(), L"a");
- if (!result)
+ errno_t log_res = _wfopen_s(&log_handle, dalamud_log_path.c_str(), L"a");
+ if (!log_res)
{
MessageBox(NULL, L"Could not open dalamud.log for writing.", L"Dalamud", MB_OK | MB_ICONERROR | MB_TOPMOST);
}
diff --git a/Dalamud/Plugin/Internal/PluginManager.cs b/Dalamud/Plugin/Internal/PluginManager.cs
index 2c3c37e5f..2b8593af4 100644
--- a/Dalamud/Plugin/Internal/PluginManager.cs
+++ b/Dalamud/Plugin/Internal/PluginManager.cs
@@ -462,6 +462,7 @@ namespace Dalamud.Plugin.Internal
/// If this plugin should support development features.
/// If this plugin is being loaded at boot.
/// Don't load the plugin, just don't do it.
+ /// The loaded plugin.
public LocalPlugin LoadPlugin(FileInfo dllFile, LocalPluginManifest manifest, PluginLoadReason reason, bool isDev = false, bool isBoot = false, bool doNotLoad = false)
{
var name = manifest?.Name ?? dllFile.Name;