piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9682 from JosJuice/fix-wii-netplay

Browse Source 
IOS: Don't let Kernel initialize WiiRoot if already initialized
This commit is contained in:
JMC47 2021-05-02 17:40:52 -04:00 committed by GitHub
commit a8c40eb510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/IOS/IOS.cpp
View File

@ -256,8 +256,11 @@ Kernel::Kernel()
// Until the Wii root and NAND path stuff is entirely managed by IOS and made non-static,
// using more than one IOS instance at a time is not supported.
ASSERT(GetIOS() == nullptr);
Core::InitializeWiiRoot(false);
m_is_responsible_for_nand_root = true;
m_is_responsible_for_nand_root = !Core::WiiRootIsInitialized();
if (m_is_responsible_for_nand_root)
Core::InitializeWiiRoot(false);
AddCoreDevices();
}

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()

1
Source/Core/Core/WiiRoot.h
View File

@ -15,6 +15,7 @@ enum class RestoreReason
void InitializeWiiRoot(bool use_temporary);
void ShutdownWiiRoot();
bool WiiRootIsInitialized();
bool WiiRootIsTemporary();
void BackupWiiSettings();