WIP

WinMerge · Oct 17, 2024 · 05fc4d2 · 05fc4d2
1 parent 956537b
commit 05fc4d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -133,7 +133,6 @@ class CMergeApp : public CWinApp
 	bool ShowCompareAsMenu(MergeCmdLineInfo& cmdInfo);
 	void ShowDialog(MergeCmdLineInfo::DialogType type);
 	void ReloadCustomSysColors();
-	void SaveCustomSysColors();
 
 	// End MergeArgs.cpp