Skip to content

Commit

Permalink
BASE: Add option for the user to proceed with resetting configuration…
Browse files Browse the repository at this point in the history
… file or quitting ScummVM.
  • Loading branch information
Attaullah Ansari authored and sev- committed Feb 23, 2023
1 parent 83cda88 commit b4fcc02
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions base/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,11 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
if (settings.contains("initial-cfg"))
initConfigFilename = settings["initial-cfg"];

bool configLoadStatus;
if (settings.contains("config")) {
ConfMan.loadConfigFile(settings["config"], initConfigFilename);
configLoadStatus = ConfMan.loadConfigFile(settings["config"], initConfigFilename);
} else {
ConfMan.loadDefaultConfigFile(initConfigFilename);
configLoadStatus = ConfMan.loadDefaultConfigFile(initConfigFilename);
}

// Update the config file
Expand Down Expand Up @@ -638,6 +639,11 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
}
setupGraphics(system);

if (!configLoadStatus) {
GUI::MessageDialog alert(_("Bad config file format. overwrite?"), _("Yes"), _("Cancel"));
if (alert.runModal() != GUI::kMessageOK)
return 0;
}
// Init the different managers that are used by the engines.
// Do it here to prevent fragmentation later
system.getAudioCDManager();
Expand Down

0 comments on commit b4fcc02

Please sign in to comment.