[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.90,1.91 options.cpp,1.52,1.53
Max Horn
fingolfin at users.sourceforge.net
Tue Mar 16 16:18:02 CET 2004
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19825/gui
Modified Files:
launcher.cpp options.cpp
Log Message:
Fix for bug #917532 (GUI: BrowserDialog return value)
Index: launcher.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/launcher.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- launcher.cpp 15 Mar 2004 02:28:47 -0000 1.90
+++ launcher.cpp 17 Mar 2004 00:07:43 -0000 1.91
@@ -399,7 +399,7 @@
// game, e.g. 'Monkey German' and 'Monkey English') and set default
// options for that game.
- if (_browser->runModal()) {
+ if (_browser->runModal() > 0) {
// User made his choice...
FilesystemNode *dir = _browser->getResult();
FSList *files = dir->listDir(FilesystemNode::kListFilesOnly);
@@ -476,7 +476,7 @@
// Display edit dialog for the new entry
EditGameDialog editDialog(domain, result);
- if (editDialog.runModal()) {
+ if (editDialog.runModal() > 0) {
// User pressed OK, so make changes permanent
// Write config to disk
@@ -496,7 +496,7 @@
void LauncherDialog::removeGame(int item) {
MessageDialog alert("Do you really want to remove this game configuration?", "Yes", "No");
- if (alert.runModal() == 1) {
+ if (alert.runModal() > 0) {
// Remove the currently selected game from the list
assert(item >= 0);
ConfMan.removeGameDomain(_domains[item]);
@@ -522,7 +522,7 @@
if (gameId.isEmpty())
gameId = _domains[item];
EditGameDialog editDialog(_domains[item], GameDetector::findGame(gameId));
- if (editDialog.runModal()) {
+ if (editDialog.runModal() > 0) {
// User pressed OK, so make changes permanent
// Write config to disk
Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- options.cpp 15 Mar 2004 02:28:47 -0000 1.52
+++ options.cpp 17 Mar 2004 00:07:43 -0000 1.53
@@ -427,7 +427,7 @@
void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kChooseSaveDirCmd:
- if (_browser->runModal()) {
+ if (_browser->runModal() > 0) {
// User made his choice...
FilesystemNode *dir = _browser->getResult();
_savePath->setLabel(dir->path());
More information about the Scummvm-git-logs
mailing list