[ 724479 ] Fix Refresh crash in empty dir view

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index a69e866..ee3d1ec 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -205,9 +205,9 @@ diff_dirs2 (filevec, handle_file, depth)
 
 void CDirDoc::Rescan()
 {
-       WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
+       if (!m_pCtxt) return;
 
-       ASSERT(m_pCtxt != NULL);
+       WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
 
        gLog.Write(_T("Starting directory scan:\r\n\tLeft: %s\r\n\tRight: %s\r\n"),
                        m_pCtxt->m_strLeft, m_pCtxt->m_strRight);

diff --git a/Src/readme.txt b/Src/readme.txt
index df848ee..33c6d01 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -6,6 +6,8 @@
    WaitStatusCursor.cpp WaitStatusCursor.h
  PATCH: [ 724473 ] Move WaitStatusCursor strings into RC
   WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.cpp MergeEditView.cpp resource.h StdAfx.cpp StdAfx.h
+ PATCH: [ 724479 ] Fix Refresh crash in empty dir view
+  WinMerge: DirDoc.cpp
 
 2003-04-19 Perry
  [ 724280 ] Could use wait cursors at OpenSelection calls