PATCH: [ 1149081 ] Invalid string compare in CChildFrm.cpp

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index f5c6c92..bb1dd8a 100644 (file)
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -640,8 +640,8 @@ static CString EolString(const CString & sEol)
 void CChildFrame::MergeStatus::SetLineInfo(LPCTSTR szLine, int nColumn,
                int nColumns, int nChar, int nChars, LPCTSTR szEol)
 {
-       if (m_sLine != szLine || m_nColumn != nColumn || m_nChars != nChars ||
-               m_sEol != szEol)
+       if (m_sLine.Compare(szLine) != 0 || m_nColumn != nColumn ||
+               m_nChars != nChars || m_sEol.Compare(szEol) != 0)
        {
                m_sLine = szLine;
                m_nColumn = nColumn;

diff --git a/Src/readme.txt b/Src/readme.txt
index a99b3c4..a212449 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2005-02-23 Kimmo
+ PATCH: [ 1149081 ] Invalid string compare in CChildFrm.cpp
+  Src: ChildFrm.cpp
+
 2005-02-22 Kimmo
  PATCH: [ 1145522 ] fix crash on search
   Submitted by Takashi Sawanaka