From f9868c807d5f9a39637db45eec9b0248cb8f8de5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 May 2011 17:43:33 +0200
Subject: BASE: Suppress pointless warning message (fixes bug #3291522)

---
 base/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index fc4523b895..b34eb6966a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -354,7 +354,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	// TODO: deal with settings that require plugins to be loaded
 	res = Base::processSettings(command, settings);
 	if (res.getCode() != Common::kArgumentNotProcessed) {
-		warning("%s", res.getDesc().c_str());
+		if (res.getCode() != Common::kNoError)
+			warning("%s", res.getDesc().c_str());
 		return res.getCode();
 	}
 
-- 
cgit v1.2.3


From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 base/main.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index b34eb6966a..4ed70a5587 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 /*! \mainpage %ScummVM Source Reference
-- 
cgit v1.2.3