aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorTarek Soliman2011-04-25 15:26:38 -0500
committerTarek Soliman2011-06-16 13:37:13 -0500
commit4d0bba314d3b584f15d1d50e59d8f1b8c9a39161 (patch)
treeb6daa3b7cc5fff831af5aba08c389748b5871d3d /base
parent71759eab534512e7a4df557f12ffadb0062a56ad (diff)
downloadscummvm-rg350-4d0bba314d3b584f15d1d50e59d8f1b8c9a39161.tar.gz
scummvm-rg350-4d0bba314d3b584f15d1d50e59d8f1b8c9a39161.tar.bz2
scummvm-rg350-4d0bba314d3b584f15d1d50e59d8f1b8c9a39161.zip
ENGINES: Warn user about games marked with ADGF_UNSTABLE flags
ADGF_UNSTABLE is always warned about. ADGF_TESTING is only warned about when running configure with --enable-relase. Both warnings are subject to the enable_wip_game_warning config option.
Diffstat (limited to 'base')
-rw-r--r--base/commandLine.cpp2
-rw-r--r--base/main.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index e34cde4779..61853a1ebc 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -186,6 +186,8 @@ void registerDefaults() {
ConfMan.registerDefault("cdrom", 0);
+ ConfMan.registerDefault("enable_unsupported_game_warning", true);
+
// Game specific
ConfMan.registerDefault("path", "");
ConfMan.registerDefault("platform", Common::kPlatformPC);
diff --git a/base/main.cpp b/base/main.cpp
index 906f4c9242..395ba8344c 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -427,7 +427,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
#endif
// Did an error occur ?
- if (result.getCode() != Common::kNoError) {
+ if (result.getCode() != Common::kNoError && result.getCode() != Common::kUserCanceled) {
// Shows an informative error dialog if starting the selected game failed.
GUI::displayErrorDialog(result, _("Error running game:"));
}