修订版 | 7ab0779fea2be1ead67fc96fbb049d4abd24755f (tree) |
---|---|
时间 | 2014-04-29 17:48:26 |
作者 | sdottaka <sdottaka@sour...> |
Commiter | sdottaka |
DiffContext.cpp: Changes of compare options were ignored when recomparing folders
--HG--
branch : stable
@@ -207,6 +207,8 @@ void CDiffContext::UpdateVersion(DIFFITEM & di, int nIndex) const | ||
207 | 207 | */ |
208 | 208 | bool CDiffContext::CreateCompareOptions(int compareMethod, const DIFFOPTIONS & options) |
209 | 209 | { |
210 | + m_pContentCompareOptions.reset(); | |
211 | + m_pQuickCompareOptions.reset(); | |
210 | 212 | m_pOptions.reset(new DIFFOPTIONS); |
211 | 213 | if (m_pOptions != NULL) |
212 | 214 | std::memcpy(m_pOptions.get(), &options, sizeof(DIFFOPTIONS)); |