From 4fd1674c49871397d3dc7ec883899a8335b381ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 23 May 2018 13:39:53 +0200 Subject: [PATCH] Core: Only init Wii FS contents in Wii mode There's no filesystem when not in Wii mode, so... bad things would happen. --- Source/Core/Core/Core.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 03f1fd4fad..b2af42fd3a 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -521,7 +521,10 @@ static void EmuThread(std::unique_ptr boot) // This is done here after Boot and not in HW to ensure that we operate // with the correct title context since save copying requires title directories to exist. Common::ScopeGuard wiifs_guard{Core::CleanUpWiiFileSystemContents}; - Core::InitializeWiiFileSystemContents(); + if (SConfig::GetInstance().bWii) + Core::InitializeWiiFileSystemContents(); + else + wiifs_guard.Dismiss(); // This adds the SyncGPU handler to CoreTiming, so now CoreTiming::Advance might block. Fifo::Prepare();