[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos_start.cpp,1.7,1.8

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory usw-pr-cvs1:/tmp/cvs-serv31761

Modified Files:
	morphos_start.cpp 
Log Message:
Cleaner CGX open/close

Index: morphos_start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_start.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- morphos_start.cpp	1 Nov 2002 23:09:07 -0000	1.7
+++ morphos_start.cpp	2 Nov 2002 10:19:27 -0000	1.8
@@ -42,7 +42,6 @@
 #include "morphos_sound.h"
 
 extern "C" WBStartup *_WBenchMsg;
-struct Library* CyberGfxBase;
 
 // For command line parsing
 static STRPTR usageTemplate = "STORY/A,DATAPATH/K,WINDOW/S,SCALER/K,AMIGA/S,MIDIUNIT/K/N,MUSIC/K,MUSICVOL/K/N,SFXVOL/K/N,TEMPO/K/N,TALKSPEED/K/N,NOSUBTITLES=NST/S";
@@ -65,6 +64,7 @@
 
 Library *CDDABase = NULL;
 Library *TimerBase = NULL;
+struct Library* CyberGfxBase = NULL;
 
 OSystem_MorphOS *TheSystem = NULL;
 
@@ -118,6 +118,9 @@
 
 	if (CDDABase)
 		CloseLibrary(CDDABase);
+
+	if (CyberGfxBase)
+		CloseLibrary(CyberGfxBase);
 }
 
 static STRPTR FindMusicDriver(STRPTR argval)
@@ -251,7 +254,10 @@
 	char *argv[20];
 	char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14];
 	int argc = 0;
+
 	CyberGfxBase = OpenLibrary("cybergraphics.library",50);
+	if (CyberGfxBase == NULL)
+		exit(1);
 
 	InitSemaphore(&ScummSoundThreadRunning);
 	InitSemaphore(&ScummMusicThreadRunning);