aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-04-04 12:36:50 +0000
committerMax Horn2004-04-04 12:36:50 +0000
commit55bbd875db1b2d20dec0381f5bd392fdd9f78daa (patch)
tree0dc1d89f13f6c293e32ec576749a132e2caa0ce2 /scumm
parente3e9ba99ee12afcfb9e099bf438716d8247ae7c6 (diff)
downloadscummvm-rg350-55bbd875db1b2d20dec0381f5bd392fdd9f78daa.tar.gz
scummvm-rg350-55bbd875db1b2d20dec0381f5bd392fdd9f78daa.tar.bz2
scummvm-rg350-55bbd875db1b2d20dec0381f5bd392fdd9f78daa.zip
Exit quietly if we just told the user we are going to exit; no need to call error() (which pops up the console etc.)
svn-id: r13456
Diffstat (limited to 'scumm')
-rw-r--r--scumm/resource.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index a762dff373..5dd13c2f82 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -242,13 +242,16 @@ void ScummEngine::askForDisk(const char *filename, int disknum) {
#endif
result = displayMessage("Quit", buf);
- if (result == 2)
- error("Cannot find file: '%s'", filename);
+ if (result == 2) {
+ //error("Cannot find file: '%s'", filename);
+ _system->quit();
+ }
} else {
sprintf(buf, "Cannot find file: '%s'", filename);
InfoDialog dialog(this, (char*)buf);
runDialog(dialog);
- error("Cannot find file: '%s'", filename);
+ //error("Cannot find file: '%s'", filename);
+ _system->quit();
}
}