From 05fc4d291b60d254fe3ce237dd770814dff8d8f0 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Fri, 18 Oct 2024 07:39:37 +0900 Subject: [PATCH] WIP --- Src/Merge.cpp | 10 ++-------- Src/Merge.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 53bcd597476..af646f2c40d 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -1770,14 +1770,8 @@ void CMergeApp::ReloadCustomSysColors() { SysColorHook::Unhook(AfxGetInstanceHandle()); SysColorHook::Deserialize(GetOptionsMgr()->GetString(OPT_SYSCOLOR_HOOK_COLORS)); + if (GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED)) + SysColorHook::Hook(AfxGetInstanceHandle()); afxData.UpdateSysColors(); - if (!GetOptionsMgr()->GetBool(OPT_SYSCOLOR_HOOK_ENABLED)) - return; - SysColorHook::Hook(AfxGetInstanceHandle()); -} - -void CMergeApp::SaveCustomSysColors() -{ - GetOptionsMgr()->SaveOption(OPT_SYSCOLOR_HOOK_COLORS, SysColorHook::Serialize()); } diff --git a/Src/Merge.h b/Src/Merge.h index cd9c7a7476c..1c850848722 100644 --- a/Src/Merge.h +++ b/Src/Merge.h @@ -133,7 +133,6 @@ class CMergeApp : public CWinApp bool ShowCompareAsMenu(MergeCmdLineInfo& cmdInfo); void ShowDialog(MergeCmdLineInfo::DialogType type); void ReloadCustomSysColors(); - void SaveCustomSysColors(); // End MergeArgs.cpp