summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/FileSystemGCWii.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-03-23 22:56:15 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2014-03-23 22:56:15 -0500
commit94ceb4d305cda79d6379dd62f8c2b18495e23c20 (patch)
treea7db4eb6db0124e9ba7321ecf0abf49d5ffd7f99 /Source/Core/DiscIO/FileSystemGCWii.cpp
parent9849129b5d3fef5caa308c5ee1adebc2e07cc39d (diff)
parent5310d6d2ea0233f745aa6fc9884930f7d30d4fee (diff)
Merge pull request #203 from Sonicadvance1/fix-crash
Fix a crash that got recently introduced.
Diffstat (limited to 'Source/Core/DiscIO/FileSystemGCWii.cpp')
-rw-r--r--Source/Core/DiscIO/FileSystemGCWii.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp
index f9f88e8d02..cdd830c6f6 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/FileSystemGCWii.cpp
@@ -60,7 +60,7 @@ const std::string CFileSystemGCWii::GetFileName(u64 _Address)
}
}
- return nullptr;
+ return "";
}
u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize)