• R/O
  • HTTP
  • SSH
  • HTTPS

winmerge-jp: Commit


Commit MetaInfo

Revisão7ab0779fea2be1ead67fc96fbb049d4abd24755f (tree)
Hora2014-04-29 17:48:26
Autorsdottaka <sdottaka@sour...>
Commitersdottaka

Mensagem de Log

DiffContext.cpp: Changes of compare options were ignored when recomparing folders

--HG--
branch : stable

Mudança Sumário

Diff

--- a/Src/DiffContext.cpp
+++ b/Src/DiffContext.cpp
@@ -207,6 +207,8 @@ void CDiffContext::UpdateVersion(DIFFITEM & di, int nIndex) const
207207 */
208208 bool CDiffContext::CreateCompareOptions(int compareMethod, const DIFFOPTIONS & options)
209209 {
210+ m_pContentCompareOptions.reset();
211+ m_pQuickCompareOptions.reset();
210212 m_pOptions.reset(new DIFFOPTIONS);
211213 if (m_pOptions != NULL)
212214 std::memcpy(m_pOptions.get(), &options, sizeof(DIFFOPTIONS));
Show on old repository browser