ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2914 from JosJuice/fix-volumedirectory 

Fix VolumeDirectory
This commit is contained in:
Markus Wick 2015-08-26 22:12:23 +02:00
parent 3e9dac3910 d276d1abbb
commit 54f882704a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/FileUtil.cpp
View File

@ -499,6 +499,7 @@ FSTEntry ScanDirectoryTree(const std::string &directory, bool recursive)
entry = ScanDirectoryTree(physical_name, true); entry = ScanDirectoryTree(physical_name, true);
else else
entry.size = 0; entry.size = 0;
parent_entry.size += entry.size;
} }
else else
{ {

2
Source/Core/Common/FileUtil.h
View File

@ -58,7 +58,7 @@ namespace File
struct FSTEntry struct FSTEntry
{ {
bool isDirectory; bool isDirectory;
u64 size; // File length or number of entries from children u64 size; // File length, or for directories, recursive count of children
std::string physicalName; // Name on disk std::string physicalName; // Name on disk
std::string virtualName; // Name in FST names table std::string virtualName; // Name in FST names table
std::vector<FSTEntry> children; std::vector<FSTEntry> children;