diff options
| author |  bunnei | 2018-08-27 18:18:31 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-27 18:18:31 -0400 |
| commit | 2562fe4a16c823013336044844a995c185e2e06b (patch) | |
| tree | 627cc10c185eee85f7a88ab1468cd4414f9fd947 /src | |
| parent | Merge pull request #1175 from lioncash/ns (diff) | |
| parent | file_util: Correct return value in early exit of ReadFileToString() (diff) | |
| download | yuzu-2562fe4a16c823013336044844a995c185e2e06b.tar.gz yuzu-2562fe4a16c823013336044844a995c185e2e06b.tar.xz yuzu-2562fe4a16c823013336044844a995c185e2e06b.zip | |
Merge pull request #1170 from lioncash/ret
file_util: Correct return value in early exit of ReadFileToString()
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/file_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index b30a67ff9..baa721481 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp | |||
| @@ -764,7 +764,7 @@ size_t ReadFileToString(bool text_file, const char* filename, std::string& str) | |||
| 764 | IOFile file(filename, text_file ? "r" : "rb"); | 764 | IOFile file(filename, text_file ? "r" : "rb"); |
| 765 | 765 | ||
| 766 | if (!file.IsOpen()) | 766 | if (!file.IsOpen()) |
| 767 | return false; | 767 | return 0; |
| 768 | 768 | ||
| 769 | str.resize(static_cast<u32>(file.GetSize())); | 769 | str.resize(static_cast<u32>(file.GetSize())); |
| 770 | return file.ReadArray(&str[0], str.size()); | 770 | return file.ReadArray(&str[0], str.size()); |