[Scummvm-cvs-logs] SF.net SVN: scummvm:[44280] tools/branches/gsoc2009-gui/tool.cpp

[joostp at users.sourceforge.net]

Revision: 44280
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44280&view=rev
Author:   joostp
Date:     2009-09-23 23:45:50 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
Fix tools requiring more than 1 input file (e.g. compress_tinsel)

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/tool.cpp

Modified: tools/branches/gsoc2009-gui/tool.cpp
===================================================================
--- tools/branches/gsoc2009-gui/tool.cpp	2009-09-23 22:52:06 UTC (rev 44279)
+++ tools/branches/gsoc2009-gui/tool.cpp	2009-09-23 23:45:50 UTC (rev 44280)
@@ -93,13 +93,14 @@
 		print(s.c_str());
 	}
 
+	// Make sure we have enough input files.
+	if (_arguments.size() - _arguments_parsed < _inputPaths.size()) {
+		print("Too few input files!");
+		return -2;
+	}
+
 	// Read input files from CLI
 	for(ToolInputs::iterator iter = _inputPaths.begin(); iter != _inputPaths.end(); ++iter) {
-		if(_arguments.size() - _arguments_parsed < _inputPaths.size()) {
-			print("Too few input files!");
-			return -2;
-		}
-
 		std::string &in = _arguments[_arguments_parsed++];
 		if (!iter->file) {
 			// Append '/' to input if it's not already done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.