aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeeraj Kumar2010-08-07 16:17:12 +0000
committerNeeraj Kumar2010-08-07 16:17:12 +0000
commita4a28eb16e3f2c9d1f4e79120b359821d731eecf (patch)
tree6573934b69219304ec7bbfacb538f9aa23e66140
parent7e126ed299cb789340cb2f8d409338dbdd6c8235 (diff)
downloadscummvm-rg350-a4a28eb16e3f2c9d1f4e79120b359821d731eecf.tar.gz
scummvm-rg350-a4a28eb16e3f2c9d1f4e79120b359821d731eecf.tar.bz2
scummvm-rg350-a4a28eb16e3f2c9d1f4e79120b359821d731eecf.zip
TESTBED: fix in fs tests
svn-id: r51837
-rw-r--r--engines/testbed/fs.cpp1
-rw-r--r--gui/widget.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/testbed/fs.cpp b/engines/testbed/fs.cpp
index 0d897ab5ff..6bd67022ee 100644
--- a/engines/testbed/fs.cpp
+++ b/engines/testbed/fs.cpp
@@ -160,6 +160,7 @@ void FSTestSuite::enable(bool flag) {
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);
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 07cf4407a2..f8713a14db 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -274,7 +274,7 @@ void StaticTextWidget::drawWidget() {
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);