[Scummvm-cvs-logs] CVS: scummvm/gui options.cpp,1.14,1.15

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv31474/gui

Modified Files:
	options.cpp 
Log Message:
make the volume controls in the global options dialog work

Index: options.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/options.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- options.cpp	25 Mar 2003 15:32:34 -0000	1.14
+++ options.cpp	25 Mar 2003 15:55:24 -0000	1.15
@@ -127,11 +127,11 @@
 	if (dir) {
 		_savePath->setLabel(dir);
 	} else {
+		// Default to the current directory...
 		char buf[256];
 		getcwd(buf, sizeof(buf));
 		_savePath->setLabel(buf);
 	}
-// If that is NULL, we should use the current directory...
 
 	//
 	// Add OK & Cancel buttons
@@ -191,6 +191,9 @@
 	case kOKCmd:
 		// TODO Write back changes made to config object
 		setResult(1);
+		_detector._master_volume = _soundVolumeMaster;
+		_detector._music_volume = _soundVolumeMusic;
+		_detector._sfx_volume = _soundVolumeSfx;
 		close();
 		break;
 	default: