diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index aeff893a3..cb25bd9b5 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -817,7 +817,8 @@ internal partial class InterfaceManager : IInternalDisposableService 0, this.SetCursorDetour); - if (ReShadeAddonInterface.ReShadeIsSignedByReShade) + if (ReShadeAddonInterface.ReShadeIsSignedByReShade && + this.dalamudConfiguration.ReShadeHandlingMode is ReShadeHandlingMode.ReShadeAddonPresent or ReShadeHandlingMode.ReShadeAddonReShadeOverlay) { Log.Warning("Signed ReShade binary detected"); Service diff --git a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs index d3298f61a..aef674ac4 100644 --- a/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs +++ b/Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabExperimental.cs @@ -81,10 +81,24 @@ public class SettingsTabExperimental : SettingsTab (v, c) => c.ReShadeHandlingMode = v, fallbackValue: ReShadeHandlingMode.Default, warning: static rshm => - rshm is ReShadeHandlingMode.UnwrapReShade or ReShadeHandlingMode.None || - Service.Get().SwapChainHookMode == SwapChainHelper.HookMode.ByteCode - ? null - : "Current option will be ignored and no special ReShade handling will be done, because SwapChain vtable hook mode is set.") + { + var warning = string.Empty; + warning += rshm is ReShadeHandlingMode.UnwrapReShade or ReShadeHandlingMode.None || + Service.Get().SwapChainHookMode == SwapChainHelper.HookMode.ByteCode + ? string.Empty + : "Current option will be ignored and no special ReShade handling will be done, because SwapChain vtable hook mode is set."; + + if (ReShadeAddonInterface.ReShadeIsSignedByReShade) + { + warning += warning.Length > 0 ? "\n" : string.Empty; + warning += Loc.Localize( + "ReShadeNoAddonSupportNotificationContent", + "Your installation of ReShade does not have full addon support, and may not work with Dalamud and/or the game.\n" + + "Download and install ReShade with full addon-support."); + } + + return warning.Length > 0 ? warning : null; + }) { FriendlyEnumNameGetter = x => x switch {