Merge pull request #6948 from leoetlino/testing

Core: Only init Wii FS contents in Wii mode
This commit is contained in:
JosJuice 2018-05-23 13:53:33 +02:00 committed by GitHub
commit 052ac16650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions

View File

@ -521,7 +521,10 @@ static void EmuThread(std::unique_ptr<BootParameters> boot)
// This is done here after Boot and not in HW to ensure that we operate // 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. // with the correct title context since save copying requires title directories to exist.
Common::ScopeGuard wiifs_guard{Core::CleanUpWiiFileSystemContents}; 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. // This adds the SyncGPU handler to CoreTiming, so now CoreTiming::Advance might block.
Fifo::Prepare(); Fifo::Prepare();