Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store configuration file in AppData root if not in working directory (#693)

Browse source 
* Store configuration file in AppData root if not in working directory

This fixes MacOS app bundles, as the emulator cannot write the config
file into the app bundle.

* Remove duplicate fs calls

* I'm an idiot sandwich

---------

Co-authored-by: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com>
This commit is contained in:
Thomas 2024-12-26 22:26:37 +01:00 • committed by GitHub
parent 8cc9bfbb36
commit e8c0b7f9c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config.cpp
View file

@ -27,6 +27,7 @@ void EmulatorConfig::load() {
return; return;
} }
printf("Loading existing configuration file %s\n", path.string().c_str());
toml::value data; toml::value data;
try { try {

10
src/emulator.cpp
View file

@ -105,7 +105,13 @@ std::filesystem::path Emulator::getConfigPath() {
if constexpr (Helpers::isAndroid()) { if constexpr (Helpers::isAndroid()) {
return getAndroidAppPath() / "config.toml"; return getAndroidAppPath() / "config.toml";
} else { } else {
return std::filesystem::current_path() / "config.toml"; std::filesystem::path localPath = std::filesystem::current_path() / "config.toml";
if (std::filesystem::exists(localPath)) {
return localPath;
} else {
return getAppDataRoot() / "config.toml";
}
} }
} }
#endif #endif
@ -468,4 +474,4 @@ void Emulator::reloadSettings() {
} }
} }
#endif #endif
} }