BUG: [ 1369856 ] Crashed when interface language is changed

diff --git a/Src/Changes.txt b/Src/Changes.txt
index b200186..23cdb08 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,6 +1,8 @@
 2005-11-30 Perry
  PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
-  Src/DiffThread.cpp
+  Src: DiffThread.cpp
+ BUG: [ 1369856 ] Crashed when interface language is changed
+  Src: DirDoc.cpp
 
 2005-11-30 Kimmo
  PATCH: [ 1369544 ] Catalan translation update

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 5c17747..f1bb91e 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -396,6 +396,12 @@ void CDirDoc::Redisplay()
        if (!m_pDirView)
                return;
 
+       // Do not redisplay an empty CDirView
+       // Not only does it not have results, but AddSpecialItems will crash
+       // trying to dereference null context pointer to get to paths
+       if (!HasDiffs())
+               return;
+
        m_pDirView->Redisplay();
 }