RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix small merge mistake

Browse source
This commit is contained in:
Bigpet 2014-02-23 18:13:08 +01:00
commit 1be8563fdb
47 changed files with 3065 additions and 785 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/FS/VFS.cpp
View file

@ -259,6 +259,8 @@ vfsDevice* VFS::GetDeviceLocal(const wxString& local_path, wxString& path) const
void VFS::Init(const wxString& path)
{
UnMountAll();
Array<VFSManagerEntry> entries;
SaveLoadDevices(entries, true);

3
rpcs3/Emu/FS/vfsDir.cpp
View file

@ -56,7 +56,6 @@ const DirEntryInfo* vfsDir::Read()
void vfsDir::Close()
{
m_stream.reset();
return vfsDirBase::Close();
}
wxString vfsDir::GetPath() const
@ -66,5 +65,5 @@ wxString vfsDir::GetPath() const
bool vfsDir::IsOpened() const
{
return m_stream && m_stream->IsOpened() && vfsDirBase::IsOpened();
return m_stream && m_stream->IsOpened();
}

2
rpcs3/Emu/FS/vfsDirBase.cpp
View file

@ -13,7 +13,7 @@ vfsDirBase::~vfsDirBase()
bool vfsDirBase::Open(const wxString& path)
{
if(!IsOpened())
if(IsOpened())
Close();
if(!IsExists(path))

6
rpcs3/Emu/FS/vfsDirBase.h
View file

@ -2,9 +2,9 @@
enum DirEntryFlags
{
DirEntry_TypeDir = 0x0,
DirEntry_TypeFile = 0x1,
DirEntry_TypeMask = 0x1,
DirEntry_TypeDir = 0x1,
DirEntry_TypeFile = 0x2,
DirEntry_TypeMask = 0x3,
DirEntry_PermWritable = 0x20,
DirEntry_PermReadable = 0x40,
DirEntry_PermExecutable = 0x80,

4
rpcs3/Emu/FS/vfsLocalDir.cpp
View file

@ -22,12 +22,12 @@ bool vfsLocalDir::Open(const wxString& path)
wxString name;
for(bool is_ok = dir.GetFirst(&name); is_ok; is_ok = dir.GetNext(&name))
{
wxString dir_path = path + wxFILE_SEP_PATH + name;
wxString dir_path = path + name;
DirEntryInfo& info = m_entries[m_entries.Move(new DirEntryInfo())];
info.name = name;
info.flags |= wxDirExists(dir_path) ? DirEntry_TypeDir : DirEntry_TypeFile;
info.flags |= dir.Exists(dir_path) ? DirEntry_TypeDir : DirEntry_TypeFile;
if(wxIsWritable(dir_path)) info.flags |= DirEntry_PermWritable;
if(wxIsReadable(dir_path)) info.flags |= DirEntry_PermReadable;
if(wxIsExecutable(dir_path)) info.flags |= DirEntry_PermExecutable;