joel16/3DShell
1
0
Fork 0
mirror of https://github.com/joel16/3DShell.git synced 2024-11-23 11:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs: Clear copy file entry before another copy/paste is made

Browse Source
This commit is contained in:
Joel16 2021-03-23 12:44:05 -04:00
parent 87140397b8
commit fd2735d524
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/fs.cpp
View File

@ -398,7 +398,14 @@ namespace FS {
return 0;
}
static void ClearFSCopyEntry(void) {
fs_copy_entry.copy_path.clear();
fs_copy_entry.copy_filename.clear();
fs_copy_entry.is_dir = false;
}
void Copy(FS_DirectoryEntry *entry, const std::string &path) {
FS::ClearFSCopyEntry();
fs_copy_entry.copy_path = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t>{}.from_bytes(path.data());
fs_copy_entry.copy_path.append(reinterpret_cast<const char16_t *>(entry->name));
fs_copy_entry.copy_filename.append(reinterpret_cast<const char16_t *>(entry->name));
@ -419,9 +426,7 @@ namespace FS {
else // Copy file
ret = FS::CopyFile(fs_copy_entry.copy_path, path);
fs_copy_entry.copy_path.clear();
fs_copy_entry.copy_filename.clear();
fs_copy_entry.is_dir = false;
FS::ClearFSCopyEntry();
return ret;
}
@ -443,9 +448,7 @@ namespace FS {
}
}
fs_copy_entry.copy_path.clear();
fs_copy_entry.copy_filename.clear();
fs_copy_entry.is_dir = false;
FS::ClearFSCopyEntry();
return 0;
}
}