Skip to content

Commit

Permalink
Store configuration file in AppData root if not in working directory
Browse files Browse the repository at this point in the history
This fixes MacOS app bundles, as the emulator cannot write the config
file into the app bundle.
  • Loading branch information
twvd committed Dec 26, 2024
1 parent 8cc9bfb commit d24b780
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ void EmulatorConfig::load() {
return;
}

printf("Loading existing configuration file %s\n", path.string().c_str());
toml::value data;

try {
Expand Down
6 changes: 5 additions & 1 deletion src/emulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,11 @@ std::filesystem::path Emulator::getConfigPath() {
if constexpr (Helpers::isAndroid()) {
return getAndroidAppPath() / "config.toml";
} else {
return std::filesystem::current_path() / "config.toml";
if (std::filesystem::exists(std::filesystem::current_path() / "config.toml")) {
return std::filesystem::current_path() / "config.toml";
} else {
return getAppDataRoot() / "config.toml";
}
}
}
#endif
Expand Down

0 comments on commit d24b780

Please sign in to comment.