BOOL CMergeDoc::Rescan(BOOL bForced /* =FALSE */)
{
- // When doing forced rescan, delete temp files first
- // to make sure we compare right files
- if (bForced)
- CleanupTempFiles();
- else
+ if (!bForced)
if (!m_bEnableRescan) return TRUE; // What return value ?
m_bNeedIdleRescan = FALSE;
{
CMergeDoc *pd = GetDocument();
ASSERT(pd);
- if (pd->SaveHelper())
- pd->FlushAndRescan(TRUE);
+ pd->FlushAndRescan(TRUE);
}
+2003-04-28 Kimmo
+ PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
+ WinMerge: MergeDoc.cpp MergeEditView.cpp
+
2003-04-27 Kimmo
BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
WinMerge: MergeDoc.cpp