[Scummvm-cvs-logs] SF.net SVN: scummvm:[51837] scummvm/branches/gsoc2010-testbed

[sud03r at users.sourceforge.net]

Revision: 51837
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51837&view=rev
Author:   sud03r
Date:     2010-08-07 16:17:12 +0000 (Sat, 07 Aug 2010)

Log Message:
-----------
TESTBED: fix in fs tests

Modified Paths:
--------------
    scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
    scummvm/branches/gsoc2010-testbed/gui/widget.cpp

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp	2010-08-07 15:35:39 UTC (rev 51836)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp	2010-08-07 16:17:12 UTC (rev 51837)
@@ -160,6 +160,7 @@
 	Common::FSNode gameIdentificationFile = gameRoot.getChild("TESTBED");
 	if (!gameIdentificationFile.exists()) {
 		logPrintf("WARNING! : Game Data not found. Skipping FS tests\n");
+		Testsuite::enable(false);
 		return;
 	}
 	Testsuite::enable(flag);

Modified: scummvm/branches/gsoc2010-testbed/gui/widget.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/gui/widget.cpp	2010-08-07 15:35:39 UTC (rev 51836)
+++ scummvm/branches/gsoc2010-testbed/gui/widget.cpp	2010-08-07 16:17:12 UTC (rev 51837)
@@ -274,7 +274,7 @@
 
 ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &label, const char *tooltip, uint32 cmd, uint8 hotkey)
 	: StaticTextWidget(boss, x, y, w, h, cleanupHotkey(label), Graphics::kTextAlignCenter, tooltip), CommandSender(boss),
-	  _cmd(cmd) {
+	  _cmd(cmd), _hotkey(hotkey) {
 
 	if (hotkey == 0)
 		_hotkey = parseHotkey(label);


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