[ 692922 ] Don't try to compare file & directory

diff --git a/Src/OpenDlg.cpp b/Src/OpenDlg.cpp
index 9706e1b..1f5854b 100644 (file)
--- a/Src/OpenDlg.cpp
+++ b/Src/OpenDlg.cpp
@@ -209,10 +209,20 @@ BOOL COpenDlg::OnInitDialog()
 void COpenDlg::UpdateButtonStates()
 {
        BOOL bLIsDir, bRIsDir;
+       BOOL bLeftOk, bRightOk;
+       BOOL bEnableOK = FALSE;
        UpdateData(TRUE);
 
-       // only enable OK button if both file exist
-       BOOL bEnableOK = (IsFileOk(m_strLeft, &bLIsDir) && IsFileOk(m_strRight, &bRIsDir));
+       // Only enable OK button if both are exixting files or
+       // both are existing directories
+       bLeftOk = IsFileOk(m_strLeft, &bLIsDir);
+       bRightOk = IsFileOk(m_strRight, &bRIsDir);
+
+       if (bLeftOk && bRightOk)
+       {       
+               if ((bLIsDir && bRIsDir) || (!bLIsDir && !bRIsDir))
+                       bEnableOK = TRUE;
+       }
        m_ctlOk.EnableWindow(bEnableOK);
        m_ctlRecurse.EnableWindow(bEnableOK && bLIsDir && bRIsDir);
 }

diff --git a/Src/readme.txt b/Src/readme.txt
index f1707ba..7fd0fa1 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2003-02-26 Kimmo
+ [ 692922 ] Don't try to compare file & directory
+  WinMerge:
+   OpenDlg.cpp
+
 2003-02-24 Kimmo
  [ 687574 ] Navigate in directory view (fix bug in patch)
   WinMerge:
@@ -6,7 +11,6 @@
   WinMerge:  
    MergeDoc.h Mergedoc.cpp
 
-
 2003-02-22 Perry
  [ 650356 ] suggest commenting out several functions
  [ 684416 ] is_all_whitespace is bad