Explorar o código

Merge branch 'yuzu-emu:master' into master

BytesGalore %!s(int64=4) %!d(string=hai) anos
pai
achega
5784aa1064
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      src/common/host_memory.cpp

+ 2 - 2
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;
     }