[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.197,1.198
Max Horn
fingolfin at users.sourceforge.net
Sun Apr 4 05:50:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24011
Modified Files:
resource.cpp
Log Message:
Exit quietly if we just told the user we are going to exit; no need to call error() (which pops up the console etc.)
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- resource.cpp 29 Mar 2004 11:02:45 -0000 1.197
+++ resource.cpp 4 Apr 2004 12:36:50 -0000 1.198
@@ -242,13 +242,16 @@
#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();
}
}
More information about the Scummvm-git-logs
mailing list