[Scummvm-cvs-logs] CVS: scummvm/gui launcher.cpp,1.88,1.88.2.1 options.cpp,1.47.2.1,1.47.2.2

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19824/gui

Modified Files:
      Tag: branch-0-6-0
	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.88
retrieving revision 1.88.2.1
diff -u -d -r1.88 -r1.88.2.1
--- launcher.cpp	9 Feb 2004 07:52:21 -0000	1.88
+++ launcher.cpp	17 Mar 2004 00:08:15 -0000	1.88.2.1
@@ -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.47.2.1
retrieving revision 1.47.2.2
diff -u -d -r1.47.2.1 -r1.47.2.2
--- options.cpp	24 Feb 2004 21:54:09 -0000	1.47.2.1
+++ options.cpp	17 Mar 2004 00:08:15 -0000	1.47.2.2
@@ -438,7 +438,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());