From 4d0bba314d3b584f15d1d50e59d8f1b8c9a39161 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Mon, 25 Apr 2011 15:26:38 -0500
Subject: 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.
---
 base/commandLine.cpp | 2 ++
 base/main.cpp        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'base')

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:"));
 			}
-- 
cgit v1.2.3