summaryrefslogtreecommitdiff
path: root/src/common/host_memory.cpp
diff options
context:
space:
mode:
authorGravatar BytesGalore2022-03-06 11:38:18 +0100
committerGravatar GitHub2022-03-06 11:38:18 +0100
commit5784aa1064246091d8f17215edbca83e298be139 (patch)
tree6bc5d772b82e69104ddc1655376f9bdf20212735 /src/common/host_memory.cpp
parentloader: log the type of mismatching file-extension (diff)
parentMerge pull request #7973 from Morph1984/debug-crash (diff)
downloadyuzu-5784aa1064246091d8f17215edbca83e298be139.tar.gz
yuzu-5784aa1064246091d8f17215edbca83e298be139.tar.xz
yuzu-5784aa1064246091d8f17215edbca83e298be139.zip
Merge branch 'yuzu-emu:master' into master
Diffstat (limited to 'src/common/host_memory.cpp')
-rw-r--r--src/common/host_memory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index 28949fe5e..c465cfc14 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -327,8 +327,8 @@ private:
327 bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { 327 bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const {
328 const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); 328 const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length});
329 if (it != placeholders.end() && it->lower() == virtual_offset + length) { 329 if (it != placeholders.end() && it->lower() == virtual_offset + length) {
330 const bool is_root = it == placeholders.begin() && virtual_offset == 0; 330 return it == placeholders.begin() ? virtual_offset == 0
331 return is_root || std::prev(it)->upper() == virtual_offset; 331 : std::prev(it)->upper() == virtual_offset;
332 } 332 }
333 return false; 333 return false;
334 } 334 }