[Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.10,1.11 gui.cpp,1.8,1.9
James Brown
ender at users.sourceforge.net
Mon Sep 16 21:53:02 CEST 2002
Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27264/gui
Modified Files:
dialog.cpp gui.cpp
Log Message:
Replace some exit()'s with a call to the OSystem quit method, as per 610251.
Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dialog.cpp 10 Sep 2002 11:52:37 -0000 1.10
+++ dialog.cpp 17 Sep 2002 04:52:50 -0000 1.11
@@ -373,8 +373,10 @@
case kOptionsCmd:
_gui->optionsDialog();
break;
- case kQuitCmd:
- exit(1);
+ case kQuitCmd: {
+ Scumm *s = _gui->getScumm();
+ s->_system->quit();
+ }
break;
default:
Dialog::handleCommand(sender, cmd, data);
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/gui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gui.cpp 15 Sep 2002 09:06:58 -0000 1.8
+++ gui.cpp 17 Sep 2002 04:52:50 -0000 1.9
@@ -862,7 +862,7 @@
#ifdef _WIN32_WCE
do_quit();
#endif
- exit(1);
+ _s->_system->quit();
return;
case 7: /* cancel button */
_cur_page = 0;
More information about the Scummvm-git-logs
mailing list