HexView: diff text color became white if selected GitHub/Bitbucket color scheme

--HG--
branch : stable

diff --git a/Src/HexMergeFrm.cpp b/Src/HexMergeFrm.cpp
index 9a93ee6..d92086f 100644 (file)
--- a/Src/HexMergeFrm.cpp
+++ b/Src/HexMergeFrm.cpp
@@ -109,7 +109,11 @@ static void Customize(IHexEditorWindow::Colors *colors)
        colors->iDiffBkColorValue = pOptionsMgr->GetInt(OPT_CLR_DIFF);
        colors->iSelDiffBkColorValue = pOptionsMgr->GetInt(OPT_CLR_SELECTED_DIFF);
        colors->iDiffTextColorValue = pOptionsMgr->GetInt(OPT_CLR_DIFF_TEXT);
+       if (colors->iDiffTextColorValue == 0xFFFFFFFF)
+               colors->iDiffTextColorValue = 0;
        colors->iSelDiffTextColorValue = pOptionsMgr->GetInt(OPT_CLR_SELECTED_DIFF_TEXT);
+       if (colors->iSelDiffTextColorValue == 0xFFFFFFFF)
+               colors->iSelDiffTextColorValue = 0;
 }
 
 /**