[Winmerge-svn] SF.net SVN: winmerge: [3884] branches/R2_6/Src

[<sdo...@us...>]

Revision: 3884
          http://svn.sourceforge.net/winmerge/?rev=3884&view=rev
Author:   sdottaka
Date:     2006-12-01 22:20:59 -0800 (Fri, 01 Dec 2006)

Log Message:
-----------
BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/DirActions.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2006-12-02 06:19:30 UTC (rev 3883)
+++ branches/R2_6/Src/Changes.txt	2006-12-02 06:20:59 UTC (rev 3884)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-12-02 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
+  Src: DirActions.cpp
+
 2006-11-30 Kimmo
  PATCH: [ 1605682 ] Add Syntax Highlight option to config log
   Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp

Modified: branches/R2_6/Src/DirActions.cpp
===================================================================
--- branches/R2_6/Src/DirActions.cpp	2006-12-02 06:19:30 UTC (rev 3883)
+++ branches/R2_6/Src/DirActions.cpp	2006-12-02 06:20:59 UTC (rev 3884)
@@ -329,7 +329,10 @@
 				sFullDest += _T("\\");
 				if (!di.sLeftSubdir.IsEmpty())
 					sFullDest += di.sLeftSubdir + _T("\\");
-				sFullDest += di.sLeftFilename;
+				if (di.isDirectory())
+					paths_CreateIfNeeded(sFullDest);
+				else
+					sFullDest += di.sLeftFilename;
 				fileOp.AddDestFile(sFullDest);
 			}
 			GetItemFileNames(sel, slFile, srFile);
@@ -382,7 +385,10 @@
 				sFullDest += _T("\\");
 				if (!di.sRightSubdir.IsEmpty())
 					sFullDest += di.sRightSubdir + _T("\\");
-				sFullDest += di.sRightFilename;
+				if (di.isDirectory())
+					paths_CreateIfNeeded(sFullDest);
+				else
+					sFullDest += di.sRightFilename;
 				fileOp.AddDestFile(sFullDest);
 			}
 			GetItemFileNames(sel, slFile, srFile);
@@ -435,7 +441,10 @@
 				if (!di.sLeftSubdir.IsEmpty())
 					sFullDest += di.sLeftSubdir + _T("\\");
 			}
-			sFullDest += di.sLeftFilename;
+			if (di.isDirectory())
+				paths_CreateIfNeeded(sFullDest);
+			else
+				sFullDest += di.sLeftFilename;
 			act.dest = sFullDest;
 
 			GetItemFileNames(sel, slFile, srFile);
@@ -490,7 +499,10 @@
 				if (!di.sRightSubdir.IsEmpty())
 					sFullDest += di.sRightSubdir + _T("\\");
 			}
-			sFullDest += di.sRightFilename;
+			if (di.isDirectory())
+				paths_CreateIfNeeded(sFullDest);
+			else
+				sFullDest += di.sRightFilename;
 			act.dest = sFullDest;
 
 			GetItemFileNames(sel, slFile, srFile);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.