tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 23:36:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix OSFilesMergeInner not using CopyTree for directories.

Browse source
This commit is contained in:
TomAwezome 2022-10-23 19:04:40 -04:00
parent e2c6bd060e
commit f43001300e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Misc/OSInstall.ZC
View file

@ -38,7 +38,14 @@ U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_df_flags)
"$$BROWN$$Does Not Exist:%s$$FG$$\n", tmpde1->full_name; "$$BROWN$$Does Not Exist:%s$$FG$$\n", tmpde1->full_name;
new = StrNew(tmpde1->full_name); new = StrNew(tmpde1->full_name);
new[0] = tmpde2->full_name[0]; // shortcut to quickly get drive letter new[0] = tmpde2->full_name[0]; // shortcut to quickly get drive letter
if (tmpde1->attr & RS_ATTR_DIR)
CopyTree(tmpde1->full_name, new);
else
{
Copy(tmpde1->full_name, new); Copy(tmpde1->full_name, new);
}
Free(new); Free(new);
} }
else else