diff options
| author | 2018-08-25 18:59:19 -0400 | |
|---|---|---|
| committer | 2018-09-04 16:21:40 -0400 | |
| commit | d2caf4af7da36f3947eea17656f9c85a6709707c (patch) | |
| tree | 4d6eafa43658007c6c96142a58ffc5c858d3fe61 /src | |
| parent | aes_util: Fix error involving reads of less than 0x10 (diff) | |
| download | yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.gz yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.tar.xz yuzu-d2caf4af7da36f3947eea17656f9c85a6709707c.zip | |
game_list: Use RegisteredCacheUnion for installed
Reduces code
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 { | |||
| 21 | UpdateIV(base_offset + offset); | 21 | UpdateIV(base_offset + offset); |
| 22 | std::vector<u8> raw = base->ReadBytes(length, offset); | 22 | std::vector<u8> raw = base->ReadBytes(length, offset); |
| 23 | cipher.Transcode(raw.data(), raw.size(), data, Op::Decrypt); | 23 | cipher.Transcode(raw.data(), raw.size(), data, Op::Decrypt); |
| 24 | return raw.size(); | 24 | return length; |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | // offset does not fall on block boundary (0x10) | 27 | // 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() { | |||
| 621 | stop_processing = false; | 621 | stop_processing = false; |
| 622 | watch_list.append(dir_path); | 622 | watch_list.append(dir_path); |
| 623 | FillControlMap(dir_path.toStdString()); | 623 | FillControlMap(dir_path.toStdString()); |
| 624 | AddInstalledTitlesToGameList(Service::FileSystem::GetUserNANDContents()); | 624 | AddInstalledTitlesToGameList(); |
| 625 | AddInstalledTitlesToGameList(Service::FileSystem::GetSystemNANDContents()); | ||
| 626 | AddInstalledTitlesToGameList(Service::FileSystem::GetSDMCContents()); | ||
| 627 | AddFstEntriesToGameList(dir_path.toStdString(), deep_scan ? 256 : 0); | 625 | AddFstEntriesToGameList(dir_path.toStdString(), deep_scan ? 256 : 0); |
| 628 | nca_control_map.clear(); | 626 | nca_control_map.clear(); |
| 629 | emit Finished(watch_list); | 627 | 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: | |||
| 239 | const std::unordered_map<std::string, std::pair<QString, QString>>& compatibility_list; | 239 | const std::unordered_map<std::string, std::pair<QString, QString>>& compatibility_list; |
| 240 | std::atomic_bool stop_processing; | 240 | std::atomic_bool stop_processing; |
| 241 | 241 | ||
| 242 | void AddInstalledTitlesToGameList(std::shared_ptr<FileSys::RegisteredCache> cache); | 242 | void AddInstalledTitlesToGameList(); |
| 243 | void FillControlMap(const std::string& dir_path); | 243 | void FillControlMap(const std::string& dir_path); |
| 244 | void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0); | 244 | void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion = 0); |
| 245 | }; | 245 | }; |