DirView: Fix a crash when clicking Next Difference button after unchecking Show Diffe...

diff --git a/Src/DirItemIterator.h b/Src/DirItemIterator.h
index 79daf0c..0a8f237 100644 (file)
--- a/Src/DirItemIterator.h
+++ b/Src/DirItemIterator.h
@@ -121,6 +121,10 @@ public:
                                        m_pdi = reinterpret_cast<const DIFFITEM *>(m_pList->GetItemData(m_sel));
                                }
                        }
+                       else if (m_pdi == nullptr)
+                       {
+                               m_sel = -1;
+                       }
                }
        }
 

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index d4b729d..0693bc0 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -588,6 +588,9 @@ void CDirView::Redisplay()
                GetParentFrame()->SetLastCompareResult(alldiffs);
        SortColumnsAppropriately();
        SetRedraw(TRUE);
+
+       m_bNeedSearchLastDiffItem = true;
+       m_bNeedSearchFirstDiffItem = true;
 }
 
 /**