piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

IOS: Don't let Kernel initialize WiiRoot if already initialized

Browse Source 
The SaveToSYSCONF call in BootManager.cpp was unintentionally
overriding the temporary NAND set by the preceding
InitializeWiiRoot call. Fixes
https://bugs.dolphin-emu.org/issues/12500.
This commit is contained in:
JosJuice
2021-05-02 10:07:54 +02:00
parent 219f66c6e9
commit 3397f49a0a
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/WiiRoot.cpp
View File

@ -33,6 +33,7 @@ namespace Core
namespace FS = IOS::HLE::FS;
static std::string s_temp_wii_root;
static bool s_wii_root_initialized = false;
static bool CopyBackupFile(const std::string& path_from, const std::string& path_to)
{
@ -170,6 +171,8 @@ static void InitializeDeterministicWiiSaves(FS::FileSystem* session_fs)
void InitializeWiiRoot(bool use_temporary)
{
ASSERT(!s_wii_root_initialized);
if (use_temporary)
{
s_temp_wii_root = File::GetUserPath(D_USER_IDX) + "WiiSession" DIR_SEP;
@ -198,6 +201,8 @@ void InitializeWiiRoot(bool use_temporary)
{
File::SetUserPath(D_SESSION_WIIROOT_IDX, File::GetUserPath(D_WIIROOT_IDX));
}
s_wii_root_initialized = true;
}
void ShutdownWiiRoot()
@ -207,6 +212,13 @@ void ShutdownWiiRoot()
File::DeleteDirRecursively(s_temp_wii_root);
s_temp_wii_root.clear();
}
s_wii_root_initialized = false;
}
bool WiiRootIsInitialized()
{
return s_wii_root_initialized;
}
bool WiiRootIsTemporary()