[ 697320 ] Saving enabled when comparing directories

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 0e71e03..522f316 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -90,6 +90,7 @@ BEGIN_MESSAGE_MAP(CDirView, CListViewEx)
        ON_UPDATE_COMMAND_UI(ID_PREVDIFF, OnUpdatePrevdiff)
        ON_COMMAND(ID_CURDIFF, OnCurdiff)
        ON_UPDATE_COMMAND_UI(ID_CURDIFF, OnUpdateCurdiff)
+       ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateSave)
        //}}AFX_MSG_MAP
        ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
 END_MESSAGE_MAP()
@@ -1060,3 +1061,8 @@ void CDirView::MoveSelection(int currentInd, int i, int selCount)
        m_pList->SetItemState(i, LVIS_FOCUSED, LVIS_FOCUSED);
        m_pList->EnsureVisible(i, FALSE);
 }
+
+void CDirView::OnUpdateSave(CCmdUI* pCmdUI)
+{
+       pCmdUI->Enable(FALSE);
+}

diff --git a/Src/DirView.h b/Src/DirView.h
index 2960217..93ed331 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -189,6 +189,7 @@ protected:
        afx_msg void OnUpdatePrevdiff(CCmdUI* pCmdUI);
        afx_msg void OnCurdiff();
        afx_msg void OnUpdateCurdiff(CCmdUI* pCmdUI);
+       afx_msg void OnUpdateSave(CCmdUI* pCmdUI);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 private:

diff --git a/Src/readme.txt b/Src/readme.txt
index a4d6242..0e5abf7 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -4,6 +4,8 @@
   WinMerge: Merge.cpp
  PATCH: [ 696588 ] Multimonitor + virtual screens support
   WinMerge: MainFrm.cpp Merge.dsp multimon.h
+ BUG: [ 697320 ] Saving enabled when comparing directories
+  WinMerge: DirView.h DirView.cpp
 
 2003-02-28 Kimmo
  BUG: [ 693932 ] Trailing \ on path crashes WinMerge