From 14c9ad56501798a9dafe61c4f40914d43cbd40f6 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Thu, 17 Jan 2013 01:01:22 +0800 Subject: [PATCH] Fixed issue #1593: Sync dialog In ChangeList shows wrong diff when pressing enter Make the behaviour of pressing enter consistent with double-clicking GitStatusListCtrl Signed-off-by: Sup Yut Sum --- src/Changelog.txt | 1 + src/Git/GitStatusListCtrl.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 22159ae09..477711793 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -45,6 +45,7 @@ Released: unreleased * Fixed issue #1556: Narrower treeview when launching Settings Dialog with default page Remote * Fixed issue #1383: Pageant is not always auto-loaded if using sync remote update (some without keys) * Fixed issue #1536: Committing via log causes hidden progress dialog + * Fixed issue #1593: Sync dialog In ChangeList shows wrong diff when pressing enter = Release 1.7.15.0 = Released: 2012-11-20 diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp index e79f5d8c9..3b46dc8b9 100644 --- a/src/Git/GitStatusListCtrl.cpp +++ b/src/Git/GitStatusListCtrl.cpp @@ -3170,7 +3170,10 @@ void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult) } else { - StartDiff(index); + if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice??? + StartDiffTwo(index); + else + StartDiff(index); } } } -- 2.11.4.GIT