[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.90.2.1,1.90.2.2 main.cpp,1.60.2.1,1.60.2.2

[Max Horn]

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

Modified Files:
      Tag: branch-0-7-0
	gameDetector.cpp main.cpp 
Log Message:
Backporting some changes to the 0.7.x branch, just in case

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.90.2.1
retrieving revision 1.90.2.2
diff -u -d -r1.90.2.1 -r1.90.2.2
--- gameDetector.cpp	18 Dec 2004 12:07:44 -0000	1.90.2.1
+++ gameDetector.cpp	30 Dec 2004 13:14:03 -0000	1.90.2.2
@@ -37,7 +37,7 @@
 #endif
 
 #ifdef UNIX
-#include <sys/errno.h>
+#include <errno.h>
 #include <sys/stat.h>
 #ifdef MACOSX
 #define DEFAULT_SAVE_PATH "Documents/ScummVM Savegames"

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -u -d -r1.60.2.1 -r1.60.2.2
--- main.cpp	20 Dec 2004 01:26:42 -0000	1.60.2.1
+++ main.cpp	30 Dec 2004 13:14:03 -0000	1.60.2.2
@@ -119,7 +119,7 @@
 #ifdef USE_MPEG2
 	"MPEG2 "
 #endif
-	;	
+	;
 
 #if defined(WIN32) && defined(NO_CONSOLE)
 #include <cstdio>
@@ -184,7 +184,7 @@
 
 #endif
 
-static int launcherDialog(GameDetector &detector, OSystem *system) {
+static bool launcherDialog(GameDetector &detector, OSystem *system) {
 
 	system->beginGFXTransaction();
 		// Set the user specified graphics mode (if any).
@@ -232,7 +232,7 @@
 #else
 	GUI::LauncherDialog dlg(detector);
 #endif
-	return dlg.runModal();
+	return (dlg.runModal() != -1);
 }
 
 static int runGame(GameDetector &detector, OSystem *system) {
@@ -375,7 +375,7 @@
 
 	// Unless a game was specified, show the launcher dialog
 	if (detector._targetName.isEmpty())
-		launcherDialog(detector, system);
+		running = launcherDialog(detector, system);
 
 	// FIXME: We're now looping the launcher. This, of course, doesn't
 	// work as well as it should. In theory everything should be destroyed
@@ -401,7 +401,7 @@
 			PluginManager::instance().loadPlugins();
 		}
 
-		launcherDialog(detector, system);
+		running = launcherDialog(detector, system);
 	}
 
 	// ...and quit (the return 0 should never be reached)