From c7f7c173b4924e520d576028bec49db277bc4aaf Mon Sep 17 00:00:00 2001
From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
Date: Sun, 6 Aug 2023 15:50:13 +0300
Subject: [PATCH] Change shared memory remap panic to warning
---
src/core/memory.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index ee616b63..3b987507 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -394,7 +394,8 @@ MemoryInfo Memory::queryMemory(u32 vaddr) {
u8* Memory::mapSharedMemory(Handle handle, u32 vaddr, u32 myPerms, u32 otherPerms) {
for (auto& e : sharedMemBlocks) {
if (e.handle == handle) {
- if (e.mapped) Helpers::panic("Allocated shared memory block twice. Is this allowed?");
+ // Virtual Console titles trigger this. TODO: Investigate how it should work
+ if (e.mapped) Helpers::warn("Allocated shared memory block twice. Is this allowed?");
const u32 paddr = e.paddr;
const u32 size = e.size;