[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.46,1.47 gui.h,1.22,1.23

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5304

Modified Files:
	gui.cpp gui.h 
Log Message:
Keep sound paused if it was paused when entering the gui

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gui.cpp	12 May 2002 21:39:19 -0000	1.46
+++ gui.cpp	14 May 2002 07:58:58 -0000	1.47
@@ -950,6 +950,7 @@
 	if (_active && !_inited) {
 		_inited = true;
 		draw(0, 200);								// was 100		
+		_old_soundsPaused = _s->_soundsPaused;
 		_s->pauseSounds(true);
 
 		// Backup old cursor
@@ -1004,7 +1005,7 @@
 
 	_s->_system->show_mouse(_old_cursor_mode);
 
-	_s->pauseSounds(false);
+	_s->pauseSounds(_old_soundsPaused);
 	_active = false;
 	_inited = false;
 

Index: gui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gui.h	12 May 2002 19:25:44 -0000	1.22
+++ gui.h	14 May 2002 07:58:58 -0000	1.23
@@ -60,6 +60,7 @@
 	byte _dialog;
 	int _clickWidget;
 	char *_queryMess;
+	bool _old_soundsPaused;
 	
 	// mouse cursor state
 	bool _old_cursor_mode;