Permalink
Browse files

Merge pull request #6944 from leoetlino/init-fs-contents

Move Wii FS content init to happen after Boot
  • Loading branch information...
leoetlino committed May 23, 2018
2 parents 51410b7 + 593f58b commit da03ff2e257ea98cedfc438390bf9a2aa1e2c62d
Showing with 6 additions and 2 deletions.
  1. +6 −0 Source/Core/Core/Core.cpp
  2. +0 −2 Source/Core/Core/HW/HW.cpp
@@ -517,6 +517,12 @@ static void EmuThread(std::unique_ptr<BootParameters> boot)
if (!CBoot::BootUp(std::move(boot)))
return;
// Initialise Wii filesystem contents.
// 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();
// This adds the SyncGPU handler to CoreTiming, so now CoreTiming::Advance might block.
Fifo::Prepare();
@@ -54,13 +54,11 @@ void Init()
Core::InitializeWiiRoot(Core::WantsDeterminism());
IOS::Init();
IOS::HLE::Init(); // Depends on Memory
Core::InitializeWiiFileSystemContents();
}
}
void Shutdown()
{
Core::CleanUpWiiFileSystemContents();
// IOS should always be shut down regardless of bWii because it can be running in GC mode (MIOS).
IOS::HLE::Shutdown(); // Depends on Memory
IOS::Shutdown();

0 comments on commit da03ff2

Please sign in to comment.