summaryrefslogtreecommitdiff
path: root/Source/Core/Common/NandPaths.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2017-01-13 09:39:33 +1300
committerGitHub <noreply@github.com>2017-01-13 09:39:33 +1300
commitcc513783899f84dd7dcfaa037c7f100b1a67eccd (patch)
tree0cdcc2d10c1e080dc99d982434e38b5df1903442 /Source/Core/Common/NandPaths.cpp
parentd346d4ced163502be4d308a6ce8573814454c11c (diff)
parent64101137cd6e507942364fb7e446692d69277341 (diff)
Merge pull request #4621 from leoetlino/default-sysconf
Remove pre-generated SYSCONF
Diffstat (limited to 'Source/Core/Common/NandPaths.cpp')
-rw-r--r--Source/Core/Common/NandPaths.cpp41
1 files changed, 1 insertions, 40 deletions
diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp
index 60cb49fa26..99c75f01f8 100644
--- a/Source/Core/Common/NandPaths.cpp
+++ b/Source/Core/Common/NandPaths.cpp
@@ -20,46 +20,7 @@
namespace Common
{
-static std::string s_temp_wii_root;
-
-void InitializeWiiRoot(bool use_dummy)
-{
- ShutdownWiiRoot();
- if (use_dummy)
- {
- s_temp_wii_root = File::CreateTempDir();
- if (s_temp_wii_root.empty())
- {
- ERROR_LOG(WII_IPC_FILEIO, "Could not create temporary directory");
- return;
- }
- File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, s_temp_wii_root);
- WARN_LOG(WII_IPC_FILEIO, "Using temporary directory %s for minimal Wii FS",
- s_temp_wii_root.c_str());
- static bool s_registered;
- if (!s_registered)
- {
- s_registered = true;
- atexit(ShutdownWiiRoot);
- }
- File::SetUserPath(D_SESSION_WIIROOT_IDX, s_temp_wii_root);
- }
- else
- {
- File::SetUserPath(D_SESSION_WIIROOT_IDX, File::GetUserPath(D_WIIROOT_IDX));
- }
-}
-
-void ShutdownWiiRoot()
-{
- if (!s_temp_wii_root.empty())
- {
- File::DeleteDirRecursively(s_temp_wii_root);
- s_temp_wii_root.clear();
- }
-}
-
-static std::string RootUserPath(FromWhichRoot from)
+std::string RootUserPath(FromWhichRoot from)
{
int idx = from == FROM_CONFIGURED_ROOT ? D_WIIROOT_IDX : D_SESSION_WIIROOT_IDX;
return File::GetUserPath(idx);