From a9109c755245fdd813079d88bc6bf3f5566a5877 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 30 Mar 2020 00:14:15 +1000 Subject: [PATCH] System: Don't insert blank memory card if path unspecified --- src/core/system.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/system.cpp b/src/core/system.cpp index 90f0a091a..a810c6982 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -662,6 +662,9 @@ void System::UpdateMemoryCards() for (u32 i = 0; i < NUM_CONTROLLER_AND_CARD_PORTS; i++) { m_pad->SetMemoryCard(i, nullptr); + if (settings.memory_card_paths[i].empty()) + continue; + std::unique_ptr card = MemoryCard::Open(this, settings.memory_card_paths[i]); if (card) m_pad->SetMemoryCard(i, std::move(card));