diff options
| author | BytesGalore <3903215+BytesGalore@users.noreply.github.com> | 2022-03-06 11:38:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 11:38:18 +0100 |
| commit | d97faa768c6a4684ea6337ffd07f1779726c1950 (patch) | |
| tree | 6bc5d772b82e69104ddc1655376f9bdf20212735 /src/common/host_memory.cpp | |
| parent | 8f530cbb097001fa6f263be6fecb47ac57c62efe (diff) | |
| parent | bc96f67ce1abdc3bbeb4e105e3f3114bdadf1d4f (diff) | |
Merge branch 'yuzu-emu:master' into master
Diffstat (limited to 'src/common/host_memory.cpp')
| -rw-r--r-- | src/common/host_memory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 28949fe5e7..c465cfc14b 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -327,8 +327,8 @@ private: bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); if (it != placeholders.end() && it->lower() == virtual_offset + length) { - const bool is_root = it == placeholders.begin() && virtual_offset == 0; - return is_root || std::prev(it)->upper() == virtual_offset; + return it == placeholders.begin() ? virtual_offset == 0 + : std::prev(it)->upper() == virtual_offset; } return false; } |
