aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar archshift <admin@archshift.com>2014-10-09 19:43:40 -0700
committerGravatar archshift <admin@archshift.com>2014-10-22 15:24:25 -0700
commita59f57d50467bd5dba1f28b8020278d6298babf7 (patch)
tree62f1528fcb2815bcb382ea8c606b6fa8fc18ba95 /src/core
parentefacd65b261049dae6785b22764bde4e65f80ddd (diff)
Use config files to store whether SDMC is enabled or not
Before, it used to use whether the directory actually existed. As a result, .citra-emu/sdmc was never auto-created (something quite confusing to me until I read through the logs).
Diffstat (limited to 'src/core')
-rw-r--r--src/core/file_sys/archive_sdmc.cpp10
-rw-r--r--src/core/settings.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp
index 213923c0..0b647f7d 100644
--- a/src/core/file_sys/archive_sdmc.cpp
+++ b/src/core/file_sys/archive_sdmc.cpp
@@ -10,6 +10,7 @@
#include "core/file_sys/archive_sdmc.h"
#include "core/file_sys/directory_sdmc.h"
#include "core/file_sys/file_sdmc.h"
+#include "core/settings.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// FileSys namespace
@@ -29,8 +30,13 @@ Archive_SDMC::~Archive_SDMC() {
* @return true if it initialized successfully
*/
bool Archive_SDMC::Initialize() {
- if (!FileUtil::IsDirectory(mount_point)) {
- WARN_LOG(FILESYS, "Directory %s not found, disabling SDMC.", mount_point.c_str());
+ if (!Settings::values.use_virtual_sd) {
+ WARN_LOG(FILESYS, "SDMC disabled by config.");
+ return false;
+ }
+
+ if (!FileUtil::CreateFullPath(mount_point)) {
+ WARN_LOG(FILESYS, "Unable to create SDMC path.");
return false;
}
diff --git a/src/core/settings.h b/src/core/settings.h
index a84c3d4b..d586e2ef 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -24,6 +24,8 @@ struct Values {
int pad_sdown_key;
int pad_sleft_key;
int pad_sright_key;
+
+ bool use_virtual_sd;
} extern values;
}