github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-29 22:04:02 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed patch with single file, fixed problem with 'warning' in the id in error outpur

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13933 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-01-22 13:07:52 +00:00
parent 9411554d8d
commit 26949fcca1
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/TextDiffCtrl/PatchDiff.cpp
View file

@ -76,7 +76,7 @@ PatchDiff::PatchDiff()
Title("Patch");
}
bool PatchDiff::Open(const char *patch_path, const Vector<String>& target_dirs)
bool PatchDiff::Open(const char *patch_path, const Vector<String>& target_dirs0)
{
failed_count = 0;
list.Clear();
@ -84,6 +84,11 @@ bool PatchDiff::Open(const char *patch_path, const Vector<String>& target_dirs)
ShowResult();
patch_file <<= Null;
target_dir <<= Null;
Vector<String> target_dirs;
for(String s : target_dirs0)
target_dirs.Add(UnixPath(s));
DDUMP(target_dirs);
Progress pi;
if(!patch.Load(patch_path, pi)) {