[Scummvm-cvs-logs] CVS: residual main.cpp,1.31,1.32

[Joost Peters]

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

Modified Files:
	main.cpp 
Log Message:
change initialisation order so we can't accidentally use the not-yet-initialised (g_)smush object.
this prevents a crash/hang on mac


Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- main.cpp	1 Nov 2004 18:49:48 -0000	1.31
+++ main.cpp	6 Nov 2004 22:56:28 -0000	1.32
@@ -111,8 +111,6 @@
 	if (SDL_Init(SDL_INIT_EVERYTHING) < 0)
 		return 1;
 
-	g_driver = new Driver(640, 480, 24);
-
 	atexit(SDL_Quit);
 	atexit(saveRegistry);
 
@@ -120,6 +118,8 @@
 	g_timer = new Timer();
 	g_smush = new Smush();
 
+	g_driver = new Driver(640, 480, 24);
+	
 	Mixer::instance()->start();
 
 	Bitmap *splash_bm = ResourceLoader::instance()->loadBitmap("splash.bm");