Browse Source

Merge branch 'yuzu-emu:master' into master

pull/15/merge
BytesGalore 4 years ago
committed by GitHub
parent
commit
5784aa1064
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/common/host_memory.cpp

4
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;
}

Loading…
Cancel
Save