summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando S <fsahmkow27@gmail.com>2022-03-06 04:49:27 +0100
committerGitHub <noreply@github.com>2022-03-06 04:49:27 +0100
commit5192c6499152dce28bdd07d4c0b21703cd7b5ae0 (patch)
treec169f0a89c5884ab678b3882d0e7ddf5c1ea13ff
parentMerge pull request #7935 from Wunkolo/logging-join-fix (diff)
parenthost_memory: Fix fastmem crashes in debug builds (diff)
downloadyuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.gz
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.bz2
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.lz
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.xz
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.tar.zst
yuzu-5192c6499152dce28bdd07d4c0b21703cd7b5ae0.zip
-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:
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;
}