PATCH: [ 2001237 ] Proper source displaying in "Confirm Copy" dialog

 Submitted by Denis Matiukha

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index c941b64..914573b 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -12,6 +12,8 @@ WinMerge 2.9.1.4
   BugFix: Crash when starting a second instance (#1993835)
   BugFix: Crash when starting WinMerge with only one path (#1994402)
   BugFix: Messages missing from installer translations (r5506)
+  BugFix: Always right side as origin side in copy confirmation dialog
+    when Copy To... (#2001237)
   New translation: Slovenian (#1997236)
   Translation updates:
   - Brazilian (#1994578)

diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt
index 6b7f19e..97377c8 100644 (file)
--- a/Docs/Users/Contributors.txt
+++ b/Docs/Users/Contributors.txt
@@ -139,6 +139,7 @@ Other Contributors (code, ideas, testing..):
 * Vladimir Lukianov
 * David Maisonave
 * Dmitry Maslov
+* Denis Matiukha
 * Harry Mckame
 * Oliver Mellet
 * Andreas Morsing

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index 88e471c..9d80700 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -554,6 +554,7 @@ void CDirView::DoCopyLeftTo()
                        act.context = sel;
                        act.atype = actType;
                        act.UIResult = FileActionItem::UI_DONT_CARE;
+                       act.UIOrigin = FileActionItem::UI_LEFT;
                        actionScript.AddActionItem(act);
                        ++selCount;
                }
@@ -624,6 +625,7 @@ void CDirView::DoCopyRightTo()
                        act.context = sel;
                        act.atype = actType;
                        act.UIResult = FileActionItem::UI_DONT_CARE;
+                       act.UIOrigin = FileActionItem::UI_RIGHT;
                        actionScript.AddActionItem(act);
                        ++selCount;
                }