aboutsummaryrefslogtreecommitdiff
path: root/src/libui_sdl
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2018-02-19 13:08:34 +0100
committerGitHub <noreply@github.com>2018-02-19 13:08:34 +0100
commitaab0030137d70a7ef06c2d2e859f195dd06e0079 (patch)
treeaa30c02d16c31744dc735254f5e1c5afeb95468c /src/libui_sdl
parent12e33ae872795518aba882c57857dfefbc0c0eda (diff)
parent52df6be5f8a912aeef050fa4c563cca3ef80ad5a (diff)
Merge pull request #224 from hcorion/alternate-loading
Load bios, firmware and melonDS.ini from exe, ~/.config/melonds or AppData
Diffstat (limited to 'src/libui_sdl')
-rw-r--r--src/libui_sdl/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
index 814d92c..6736fbc 100644
--- a/src/libui_sdl/main.cpp
+++ b/src/libui_sdl/main.cpp
@@ -35,6 +35,7 @@
#include "../SPU.h"
#include "../Wifi.h"
#include "../Platform.h"
+#include "../Config.h"
const int kScreenRot[4] = {0, 1, 2, 3};
@@ -1047,7 +1048,7 @@ int main(int argc, char** argv)
Config::Load();
- if (!_fileexists("bios7.bin") || !_fileexists("bios9.bin") || !_fileexists("firmware.bin"))
+ if (!Config::HasConfigFile("bios7.bin") || !Config::HasConfigFile("bios9.bin") || !Config::HasConfigFile("firmware.bin"))
{
uiMsgBoxError(
NULL,