diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-08-26 00:59:19 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-09-04 22:21:40 +0200 |
commit | d2caf4af7da36f3947eea17656f9c85a6709707c (patch) | |
tree | 4d6eafa43658007c6c96142a58ffc5c858d3fe61 /src | |
parent | aes_util: Fix error involving reads of less than 0x10 (diff) | |
download | yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.gz yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.bz2 yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.lz yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.xz yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.zst yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/crypto/ctr_encryption_layer.cpp | 2 | ||||
-rw-r--r-- | src/yuzu/game_list.cpp | 4 | ||||
-rw-r--r-- | src/yuzu/game_list_p.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/core/crypto/ctr_encryption_layer.cpp b/src/core/crypto/ctr_encryption_layer.cpp index 3ea60dbd0..296fad419 100644 --- a/src/core/crypto/ctr_encryption_layer.cpp +++ b/src/core/crypto/ctr_encryption_layer.cpp @@ -21,7 +21,7 @@ size_t CTREncryptionLayer::Read(u8* data, size_t length, size_t offset) const { UpdateIV(base_offset + offset); std::vector<u8> raw = base->ReadBytes(length, offset); cipher.Transcode(raw.data(), raw.size(), data, Op::Decrypt); - return raw.size(); + return length; } // offset does not fall on block boundary (0x10) diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index 3e2a5976b..baf78af09 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -621,9 +621,7 @@ void GameListWorker::run() { stop_processing = false; watch_list.append(dir_path); FillControlMap(dir_path.toStdString()); - AddInstalledTitlesToGameList(Service::FileSystem::GetUserNANDContents()); - AddInstalledTitlesToGameList(Service::FileSystem::GetSystemNANDContents()); - AddInstalledTitlesToGameList(Service::FileSystem::GetSDMCContents()); + AddInstalledTitlesToGameList(); AddFstEntriesToGameList(dir_path.toStdString(), deep_scan ? 256 : 0); nca_control_map.clear(); emit Finished(watch_list); diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h index 4ddd8cd88..a70a151c5 100644 --- a/src/yuzu/game_list_p.h +++ b/src/yuzu/game_list_p.h @@ -239,7 +239,7 @@ private: const std::unordered_map<std::string, std::pair<QString, QString>>& compatibility_list; std::atomic_bool stop_processing; - void AddInstalledTitlesToGameList(std::shared_ptr<FileSys::RegisteredCache> cache); + void AddInstalledTitlesToGameList(); void FillControlMap(const std::string& dir_path); void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0); }; |